leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723au: Remove calls to HW_VAR_H2C_MEDIA_STATUS

Browse Source 
This call was unhandled, so these calls were effectively a no-op

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-09 23:20:49 +02:00 committed by Greg Kroah-Hartman
parent 4b03eb73ca
commit 3d577f60da
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/rtl8723au/core/rtw_mlme.c
View File

@ -1299,12 +1299,8 @@ void rtw23a_joinbss_event_cb(struct rtw_adapter *adapter, u8 *pbuf)
/* FOR AP , AD-HOC mode */ /* FOR AP , AD-HOC mode */
void rtw_stassoc_hw_rpt23a(struct rtw_adapter *adapter, struct sta_info *psta) void rtw_stassoc_hw_rpt23a(struct rtw_adapter *adapter, struct sta_info *psta)
{ {
u16 media_status; if (psta == NULL)
return;
if (psta == NULL) return;
media_status = (psta->mac_id<<8)|1; /* MACID|OPMODE:1 connect */
rtw_hal_set_hwreg23a(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);
} }
void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf) void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf)
@ -1402,13 +1398,6 @@ void rtw_stadel_event_callback23a(struct rtw_adapter *adapter, u8 *pbuf)
DBG_8723A("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr)); DBG_8723A("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));
if(mac_id>=0) {
u16 media_status;
media_status = (mac_id<<8)|0; /* MACID|OPMODE:0 means disconnect */
/* for STA,AP,ADHOC mode, report disconnect stauts to FW */
rtw_hal_set_hwreg23a(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);
}
if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
{ {
return; return;

4
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@ -8677,7 +8677,6 @@ void mlmeext_joinbss_event_callback23a(struct rtw_adapter *padapter, int join_re
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
struct wlan_bssid_ex *cur_network = &pmlmeinfo->network; struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u16 media_status;
if (join_res < 0) { if (join_res < 0) {
hw_var_set_mlme_join(padapter, 1); hw_var_set_mlme_join(padapter, 1);
@ -8736,9 +8735,6 @@ void mlmeext_joinbss_event_callback23a(struct rtw_adapter *padapter, int join_re
/* set per sta rate after updating HT cap. */ /* set per sta rate after updating HT cap. */
set_sta_rate23a(padapter, psta); set_sta_rate23a(padapter, psta);
media_status = (psta->mac_id<<8)|1; /* MACID|OPMODE: 1 means connect */
rtw_hal_set_hwreg23a(padapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);
} }
hw_var_set_mlme_join(padapter, 2); hw_var_set_mlme_join(padapter, 2);

1
drivers/staging/rtl8723au/include/hal_intf.h
View File

@ -54,7 +54,6 @@ enum HW_VARIABLES {
/* Unit in microsecond. 0 means disable this function. */ /* Unit in microsecond. 0 means disable this function. */
HW_VAR_RPT_TIMER_SETTING, HW_VAR_RPT_TIMER_SETTING,
HW_VAR_TX_RPT_MAX_MACID, HW_VAR_TX_RPT_MAX_MACID,
HW_VAR_H2C_MEDIA_STATUS_RPT,
HW_VAR_CHK_HI_QUEUE_EMPTY, HW_VAR_CHK_HI_QUEUE_EMPTY,
HW_VAR_READ_LLT_TAB, HW_VAR_READ_LLT_TAB,
}; };