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

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 92bf1e415a95c205cf2178f2c3dbc380fdfc6578..21484e757b15a013fe761924f96870bcab30cef2 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -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 =

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index 0dd7d22eba283d77863e30f56f9fd68330ed296e..e4f4934e357d71d4db7a21d1b775d7868e21e339 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -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);
 

diff --git a/drivers/staging/rtl8723au/include/wlan_bssdef.h b/drivers/staging/rtl8723au/include/wlan_bssdef.h
index 8acc41840e32bfcdc1e10e19b09df22bf7528a46..95b32e15a4d0bc58cbb6a8403518e7b129db0ac6 100644 (file)
--- a/drivers/staging/rtl8723au/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723au/include/wlan_bssdef.h
@@ -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;