From: Jes Sorensen <jes.soren...@redhat.com>

Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
---
 drivers/staging/rtl8723au/core/rtw_mlme.c       | 3 ---
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c   | 2 +-
 drivers/staging/rtl8723au/include/wlan_bssdef.h | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c 
b/drivers/staging/rtl8723au/core/rtw_mlme.c
index cd10f12..ba77ac1 100644
--- 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;
        }
 
@@ -486,7 +485,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 */
@@ -1027,7 +1025,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 ca6055f..aa91351 100644
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -4866,7 +4866,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 8acc418..95b32e1 100644
--- 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;
-- 
1.9.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to