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

This commit is contained in:
John W. Linville 2012-06-26 11:10:47 -04:00
parent 1b3fae83d0
commit def7f17730
2 changed files with 53 additions and 0 deletions

View File

@ -0,0 +1,44 @@
commit 931cb03afed7b541392295f3afc4638da32f08a0
Author: Rajkumar Manoharan <rmanohar@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@vger.kernel.org [3.4+]
Reported-by: Michael Leun <lkml20120218@newton.leun.net>
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@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);
}
}

View File

@ -778,6 +778,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
@ -1442,6 +1445,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
@ -2180,6 +2186,9 @@ fi
# and build.
%changelog
* Tue Jun 26 2012 John W. Linville <linville@redhat.com>
- ath9k_htc: configure bssid on ASSOC/IBSS change (rhbz 828731)
* Fri Jun 22 2012 Justin M. Forbes <jforbes@redhat.com> 3.4.4-1
- Linux 3.4.4