staging: r8188eu: fix rtw_alloc_hwxmits error detection for now
In _rtw_init_xmit_priv, we use the res variable to store the error
return from the newly converted rtw_alloc_hwxmits function. Sadly, the
calling function interprets res using _SUCCESS and _FAIL still, meaning
we change the semantics of the variable, even in the success case.
This leads to the following on boot:
r8188eu 1-2:1.0: _rtw_init_xmit_priv failed
In the long term, we should reverse these semantics, but for now, this
fixes the driver. Also, inside rtw_alloc_hwxmits remove the if blocks,
as HWXMIT_ENTRY is always 4.
Fixes: f94b47c6bd
("staging: r8188eu: add check for kzalloc")
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20220521204741.921-1-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
f2906aa863
Коммит
5b7419ae1d
|
@ -178,8 +178,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
|
||||||
|
|
||||||
pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf;
|
pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf;
|
||||||
|
|
||||||
res = rtw_alloc_hwxmits(padapter);
|
if (rtw_alloc_hwxmits(padapter)) {
|
||||||
if (res) {
|
|
||||||
res = _FAIL;
|
res = _FAIL;
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
@ -1483,19 +1482,10 @@ int rtw_alloc_hwxmits(struct adapter *padapter)
|
||||||
|
|
||||||
hwxmits = pxmitpriv->hwxmits;
|
hwxmits = pxmitpriv->hwxmits;
|
||||||
|
|
||||||
if (pxmitpriv->hwxmit_entry == 5) {
|
hwxmits[0].sta_queue = &pxmitpriv->vo_pending;
|
||||||
hwxmits[0] .sta_queue = &pxmitpriv->bm_pending;
|
hwxmits[1].sta_queue = &pxmitpriv->vi_pending;
|
||||||
hwxmits[1] .sta_queue = &pxmitpriv->vo_pending;
|
hwxmits[2].sta_queue = &pxmitpriv->be_pending;
|
||||||
hwxmits[2] .sta_queue = &pxmitpriv->vi_pending;
|
hwxmits[3].sta_queue = &pxmitpriv->bk_pending;
|
||||||
hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
|
|
||||||
hwxmits[4] .sta_queue = &pxmitpriv->be_pending;
|
|
||||||
} else if (pxmitpriv->hwxmit_entry == 4) {
|
|
||||||
hwxmits[0] .sta_queue = &pxmitpriv->vo_pending;
|
|
||||||
hwxmits[1] .sta_queue = &pxmitpriv->vi_pending;
|
|
||||||
hwxmits[2] .sta_queue = &pxmitpriv->be_pending;
|
|
||||||
hwxmits[3] .sta_queue = &pxmitpriv->bk_pending;
|
|
||||||
} else {
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче