Commit 849befad authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: c2h_evt_hdl() is always called with 3rd argument = NULL

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab281e3b
...@@ -1297,8 +1297,7 @@ u8 rtw_c2h_wk_cmd23a(struct rtw_adapter *padapter, u8 *c2h_evt) ...@@ -1297,8 +1297,7 @@ u8 rtw_c2h_wk_cmd23a(struct rtw_adapter *padapter, u8 *c2h_evt)
return res; return res;
} }
static int c2h_evt_hdl(struct rtw_adapter *adapter, static int c2h_evt_hdl(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{ {
int ret = _FAIL; int ret = _FAIL;
u8 buf[16]; u8 buf[16];
...@@ -1308,19 +1307,11 @@ static int c2h_evt_hdl(struct rtw_adapter *adapter, ...@@ -1308,19 +1307,11 @@ static int c2h_evt_hdl(struct rtw_adapter *adapter,
if (c2h_evt_read23a(adapter, buf) == _SUCCESS) { if (c2h_evt_read23a(adapter, buf) == _SUCCESS) {
c2h_evt = (struct c2h_evt_hdr *)buf; c2h_evt = (struct c2h_evt_hdr *)buf;
if (filter && filter(c2h_evt->id) == false)
goto exit;
ret = rtw_hal_c2h_handler23a(adapter, c2h_evt); ret = rtw_hal_c2h_handler23a(adapter, c2h_evt);
} }
} else { } else
if (filter && filter(c2h_evt->id) == false)
goto exit;
ret = rtw_hal_c2h_handler23a(adapter, c2h_evt); ret = rtw_hal_c2h_handler23a(adapter, c2h_evt);
}
exit:
return ret; return ret;
} }
...@@ -1396,7 +1387,7 @@ u8 rtw_drvextra_cmd_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf) ...@@ -1396,7 +1387,7 @@ u8 rtw_drvextra_cmd_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
#endif /* CONFIG_8723AU_AP_MODE */ #endif /* CONFIG_8723AU_AP_MODE */
case C2H_WK_CID: case C2H_WK_CID:
c2h_evt_hdl(padapter, c2h_evt_hdl(padapter,
(struct c2h_evt_hdr *)pdrvextra_cmd->pbuf, NULL); (struct c2h_evt_hdr *)pdrvextra_cmd->pbuf);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment