[kernel/f17] ath9k_htc: configure bssid on ASSOC/IBSS change (rhbz 828731)

[John W. Linville]

commit ec675c56baab0b3bdd894800c3a47c5d35ecaa5c
Author: John W. Linville <linville at tuxdriver.com>
Date:   Tue Jun 26 11:10:47 2012 -0400

    ath9k_htc: configure bssid on ASSOC/IBSS change (rhbz 828731)

 ..._htc-configure-bssid-on-ASSOC-IBSS-change.patch |   44 ++++++++++++++++++++
 kernel.spec                                        |    9 ++++
 2 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/ath9k_htc-configure-bssid-on-ASSOC-IBSS-change.patch b/ath9k_htc-configure-bssid-on-ASSOC-IBSS-change.patch
new file mode 100644
index 0000000..51dc6e2
--- /dev/null
+++ b/ath9k_htc-configure-bssid-on-ASSOC-IBSS-change.patch
@@ -0,0 +1,44 @@
+commit 931cb03afed7b541392295f3afc4638da32f08a0
+Author: Rajkumar Manoharan <rmanohar at qca.qualcomm.com>
+Date:   Wed Jun 20 16:29:20 2012 +0530
+
+    ath9k_htc: configure bssid on ASSOC/IBSS change
+    
+    After the change "mac80211: remove spurious BSSID change flag",
+    BSS_CHANGED_BSSID will not be passed on association or IBSS
+    status changes. So it could be better to program bssid on ASSOC
+    or IBSS change notification. Not doing so, is affecting the
+    packet transmission.
+    
+    Cc: stable at vger.kernel.org [3.4+]
+    Reported-by: Michael Leun <lkml20120218 at newton.leun.net>
+    Signed-off-by: Rajkumar Manoharan <rmanohar at qca.qualcomm.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+index 2b8f61c..abbd6ef 100644
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+@@ -1496,6 +1496,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
+ 			priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--;
+ 
+ 		if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
++			ath9k_htc_choose_set_bssid(priv);
+ 			if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1))
+ 				ath9k_htc_start_ani(priv);
+ 			else if (priv->num_sta_assoc_vif == 0)
+@@ -1503,13 +1504,11 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
+ 		}
+ 	}
+ 
+-	if (changed & BSS_CHANGED_BSSID) {
++	if (changed & BSS_CHANGED_IBSS) {
+ 		if (priv->ah->opmode == NL80211_IFTYPE_ADHOC) {
+ 			common->curaid = bss_conf->aid;
+ 			memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
+ 			ath9k_htc_set_bssid(priv);
+-		} else if (priv->ah->opmode == NL80211_IFTYPE_STATION) {
+-			ath9k_htc_choose_set_bssid(priv);
+ 		}
+ 	}
+ 
diff --git a/kernel.spec b/kernel.spec
index 6a80ca5..9d8d9f9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -786,6 +786,9 @@ Patch22032: cifs-fix-parsing-of-password-mount-option.patch
 #rhbz 831807
 Patch22034: usb-storage-try-read_capacity-10-first.patch
 
+#rhbz 828731
+Patch22035: ath9k_htc-configure-bssid-on-ASSOC-IBSS-change.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1510,6 +1513,9 @@ ApplyPatch cifs-fix-parsing-of-password-mount-option.patch
 #rhbz 831807
 ApplyPatch usb-storage-try-read_capacity-10-first.patch
 
+#rhbz 828731
+ApplyPatch ath9k_htc-configure-bssid-on-ASSOC-IBSS-change.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2364,6 +2370,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Tue Jun 26 2012 John W. Linville <linville at redhat.com>
+- ath9k_htc: configure bssid on ASSOC/IBSS change (rhbz 828731)
+
 * Fri Jun 22 2012 Justin M. Forbes <jforbes at redhat.com> 3.4.4-1
 - Linux 3.4.4