diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-20 18:14:35 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-20 18:14:35 +0000 |
commit | 970252faf84b05f3e9abd5c401e13a9c625bfd92 (patch) | |
tree | 401b89fb3739f7cee09c51ce1bd45eb32498f7a5 /package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch | |
parent | 79829783916d443ca560857b922168be04785cea (diff) | |
download | upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.tar.gz upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.tar.bz2 upstream-970252faf84b05f3e9abd5c401e13a9c625bfd92.zip |
mac80211: update to wireless-testing 2011-04-19, contains several beacon related fixes for ath9k
SVN-Revision: 26744
Diffstat (limited to 'package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch')
-rw-r--r-- | package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch index b03a0661c8..d63724e90b 100644 --- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch +++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch @@ -1,11 +1,12 @@ --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1483,14 +1483,6 @@ static int ath9k_add_interface(struct ie +@@ -1439,15 +1439,6 @@ static int ath9k_add_interface(struct ie } } -- if ((vif->type == NL80211_IFTYPE_ADHOC) && -- sc->nvifs > 0) { +- if ((ah->opmode == NL80211_IFTYPE_ADHOC) || +- ((vif->type == NL80211_IFTYPE_ADHOC) && +- sc->nvifs > 0)) { - ath_err(common, "Cannot create ADHOC interface when other" - " interfaces already exist.\n"); - ret = -EINVAL; @@ -15,3 +16,19 @@ ath_dbg(common, ATH_DBG_CONFIG, "Attach a VIF of type: %d\n", vif->type); +@@ -1473,15 +1464,6 @@ static int ath9k_change_interface(struct + mutex_lock(&sc->mutex); + ath9k_ps_wakeup(sc); + +- /* See if new interface type is valid. */ +- if ((new_type == NL80211_IFTYPE_ADHOC) && +- (sc->nvifs > 1)) { +- ath_err(common, "When using ADHOC, it must be the only" +- " interface.\n"); +- ret = -EINVAL; +- goto out; +- } +- + if (ath9k_uses_beacons(new_type) && + !ath9k_uses_beacons(vif->type)) { + if (sc->nbcnvifs >= ATH_BCBUF) { |