mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: r8188eu: simplify error handling for missing station 

Simplify the code to handle the case where we're associated to a station
that is not in our list of known stations.

We can simply exit in this case. This patch reverts the if-condition and
saves one level of indentation.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221126160129.178697-10-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2022-11-26 17:01:28 +01:00 committed by Greg Kroah-Hartman
parent fa205589d5
commit dd99fe1f5a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/r8188eu/core/rtw_mlme_ext.c
View File

@ -597,19 +597,19 @@ static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) {
psta = rtw_get_stainfo(pstapriv, mgmt->sa);
if (psta) {
ret = rtw_check_bcn_info(padapter, pframe, len);
if (!ret) {
receive_disconnect(padapter,
pmlmeinfo->network.MacAddress, 0);
return;
}
/* update WMM, ERP in the beacon */
/* todo: the timer is used instead of the number of the beacon received */
if ((sta_rx_pkts(psta) & 0xf) == 0)
update_beacon_info(padapter, ie_ptr, ie_len, psta);
process_p2p_ps_ie(padapter, ie_ptr, ie_len);
if (!psta)
return;
ret = rtw_check_bcn_info(padapter, pframe, len);
if (!ret) {
receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 0);
return;
}
/* update WMM, ERP in the beacon */
/* todo: the timer is used instead of the number of the beacon received */
if ((sta_rx_pkts(psta) & 0xf) == 0)
update_beacon_info(padapter, ie_ptr, ie_len, psta);
process_p2p_ps_ie(padapter, ie_ptr, ie_len);
} else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
psta = rtw_get_stainfo(pstapriv, mgmt->sa);
if (psta) {