diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
| commit | 75a137d38bd701a4062789e7a59b173d20db6928 (patch) | |
| tree | fe2a28fedad04703b1d6951b1bc0f33b08fa4fce /package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch | |
| parent | d787e8414b4ab04ebddbf5d1a5a52278d532c4b3 (diff) | |
| download | upstream-75a137d38bd701a4062789e7a59b173d20db6928.tar.gz upstream-75a137d38bd701a4062789e7a59b173d20db6928.tar.bz2 upstream-75a137d38bd701a4062789e7a59b173d20db6928.zip | |
mac80211: update to wireless-testing 2012-06-14
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32420 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 36 |
1 files changed, 1 insertions, 35 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 0a5f6944f9..9834f1e541 100644 --- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch +++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch @@ -1,40 +1,6 @@ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1443,15 +1443,6 @@ static int ath9k_add_interface(struct ie - } - } - -- 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; -- goto out; -- } -- - ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type); - - sc->nvifs++; -@@ -1476,15 +1467,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) { --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -656,6 +656,7 @@ static const struct ieee80211_iface_limi +@@ -666,6 +666,7 @@ static const struct ieee80211_iface_limi #ifdef CONFIG_MAC80211_MESH BIT(NL80211_IFTYPE_MESH_POINT) | #endif |