ath9k_htc: configure bssid on ASSOC/IBSS change

Rajkumar Manoharan · linvjw · commit 931cb03afed7 · 2012-06-20T14:10:26.000-04:00
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@vger.kernel.org [3.4+]
Reported-by: Michael Leun &lt;lkml20120218@newton.leun.net&gt;
Signed-off-by: Rajkumar Manoharan &lt;rmanohar@qca.qualcomm.com&gt;
Signed-off-by: John W. Linville &lt;linville@tuxdriver.com&gt;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1496,20 +1496,19 @@ 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)
 				ath9k_htc_stop_ani(priv);
 		}
 	}
 
-	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);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1496,20 +1496,19 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,`
`1496`	`1496`	`priv->num_sta_assoc_vif++ : priv->num_sta_assoc_vif--;`
`1497`	`1497`
`1498`	`1498`	`if (priv->ah->opmode == NL80211_IFTYPE_STATION) {`
	`1499`	`+ ath9k_htc_choose_set_bssid(priv);`
`1499`	`1500`	`if (bss_conf->assoc && (priv->num_sta_assoc_vif == 1))`
`1500`	`1501`	`ath9k_htc_start_ani(priv);`
`1501`	`1502`	`else if (priv->num_sta_assoc_vif == 0)`
`1502`	`1503`	`ath9k_htc_stop_ani(priv);`
`1503`	`1504`	`}`
`1504`	`1505`	`}`
`1505`	`1506`
`1506`		`- if (changed & BSS_CHANGED_BSSID) {`
	`1507`	`+ if (changed & BSS_CHANGED_IBSS) {`
`1507`	`1508`	`if (priv->ah->opmode == NL80211_IFTYPE_ADHOC) {`
`1508`	`1509`	`common->curaid = bss_conf->aid;`
`1509`	`1510`	`memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);`
`1510`	`1511`	`ath9k_htc_set_bssid(priv);`
`1511`		`- } else if (priv->ah->opmode == NL80211_IFTYPE_STATION) {`
`1512`		`- ath9k_htc_choose_set_bssid(priv);`
`1513`	`1512`	`}`
`1514`	`1513`	`}`
`1515`	`1514`