shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 01:36:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Eliminate write-only struct wlan_network->aid

Browse Source 
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-10-10 21:41:38 +02:00
committed by Greg Kroah-Hartman
parent 218189b7dc
commit eb18cf6b23
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, gfp_t gfp)
pnetwork->network_type = 0;
pnetwork->fixed = false;
pnetwork->last_scanned = jiffies;
pnetwork->aid = 0;
pnetwork->join_res = 0;
}
@@ -484,7 +483,6 @@ static void rtw_update_scanned_network(struct rtw_adapter *adapter,
pnetwork->last_scanned = jiffies;
pnetwork->network_type = 0;
pnetwork->aid = 0;
pnetwork->join_res = 0;
/* bss info not receiving from the right channel */
@@ -1021,7 +1019,6 @@ rtw_joinbss_update_network23a(struct rtw_adapter *padapter,
cur_network->network.beacon_interval =
ptarget_wlan->network.beacon_interval;
cur_network->network.tsf = ptarget_wlan->network.tsf;
cur_network->aid = pnetwork->join_res;
rtw_set_signal_stat_timer(&padapter->recvpriv);
padapter->recvpriv.signal_strength =

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

@@ -4875,7 +4875,7 @@ void report_join_res23a(struct rtw_adapter *padapter, int res)
pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header));
memcpy((unsigned char *)&pjoinbss_evt->network.network,
&pmlmeinfo->network, sizeof(struct wlan_bssid_ex));
pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res;
pjoinbss_evt->network.join_res = res;
DBG_8723A("report_join_res23a(%d)\n", res);

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

@@ -99,7 +99,6 @@ struct wlan_network {
/* set to fixed when not to be removed as site-surveying */
int fixed;
unsigned long last_scanned; /* timestamp for the network */
int aid; /* will only be valid when a BSS is joined. */
int join_res;
struct wlan_bssid_ex network; /* must be the last item */
struct wlan_bcn_info BcnInfo;