From: Jes Sorensen Date: Sat, 21 Jun 2014 14:50:16 +0000 (+0200) Subject: staging: rtl8723au: rtw_survey_event_cb23a(): Remember to clone beacon data X-Git-Tag: firefly_0821_release~176^2~3491^2~1608 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eb4f07bf859d412bf4662e65d4ed2fc06994f87b;p=firefly-linux-kernel-4.4.55.git staging: rtl8723au: rtw_survey_event_cb23a(): Remember to clone beacon data We need to clone all the beacon information, not just the IE data, in particular as the long term goal is to stop carrying this information in the IE data. Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index fc848316c3f5..c91ea8c64af0 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -621,6 +621,11 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf) memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8); + pmlmepriv->cur_network.network.beacon_interval = + pnetwork->beacon_interval; + pmlmepriv->cur_network.network.capability = + pnetwork->capability; + pmlmepriv->cur_network.network.tsf = pnetwork->tsf; spin_lock_bh(&pmlmepriv->scanned_queue.lock); ibss_wlan = rtw_find_network23a( &pmlmepriv->scanned_queue, @@ -628,6 +633,12 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf) if (ibss_wlan) { memcpy(ibss_wlan->network.IEs, pnetwork->IEs, 8); + pmlmepriv->cur_network.network.beacon_interval = + ibss_wlan->network.beacon_interval; + pmlmepriv->cur_network.network.capability = + ibss_wlan->network.capability; + pmlmepriv->cur_network.network.tsf = + ibss_wlan->network.tsf; spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto exit; }