mac80211: update to the latest version from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 410-ath9k_allow_adhoc_and_ap.patch

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 b03a0661c898815c6594bfec41e48f217f3d2ca6..d63724e90bf38dd7a1da361dff263aaa573c0b9b 100644 (file)
--- 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) {