From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Tue, 24 Jun 2014 13:03:28 +0000 (+0200)
Subject: staging: rtl8723au: rtw_generate_ie23a(): update network info as well as IE
X-Git-Tag: firefly_0821_release~176^2~3491^2~1591
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4cf0d65e584329bd85beca84f04325870e2ea69;p=firefly-linux-kernel-4.4.55.git

staging: rtl8723au: rtw_generate_ie23a(): update network info as well as IE

We need to make sure to update the network info as well as the IE
array.

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_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
index efad6f8ccfb8..f235ae00db2d 100644
--- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
@@ -351,8 +351,9 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv)
 	int	sz = 0, rateLen;
 	struct wlan_bssid_ex*	pdev_network = &pregistrypriv->dev_network;
 	u8*	ie = pdev_network->IEs;
+	u16 cap;
 
-
+	pdev_network->tsf = 0;
 
 	/* timestamp will be inserted by hardware */
 	sz += 8;
@@ -368,13 +369,20 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv)
 	*(u16*)ie = 0;
 
 	*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_IBSS);
+	cap = WLAN_CAPABILITY_IBSS;
 
-	if (pregistrypriv->preamble == PREAMBLE_SHORT)
+	if (pregistrypriv->preamble == PREAMBLE_SHORT) {
 		*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
+		cap |= WLAN_CAPABILITY_SHORT_PREAMBLE;
+	}
 
-	if (pdev_network->Privacy)
+	if (pdev_network->Privacy) {
 		*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+		cap |= WLAN_CAPABILITY_PRIVACY;
+
+	}
 
+	pdev_network->capability = cap;
 	sz += 2;
 	ie += 2;