mac80211: backport latest version from trunk as of r27395
[openwrt-10.03/.git] / package / mac80211 / patches / 410-ath9k_allow_adhoc_and_ap.patch
1 --- a/drivers/net/wireless/ath/ath9k/main.c
2 +++ b/drivers/net/wireless/ath/ath9k/main.c
3 @@ -1495,15 +1495,6 @@ static int ath9k_add_interface(struct ie
4                 }
5         }
6  
7 -       if ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
8 -           ((vif->type == NL80211_IFTYPE_ADHOC) &&
9 -            sc->nvifs > 0)) {
10 -               ath_err(common, "Cannot create ADHOC interface when other"
11 -                       " interfaces already exist.\n");
12 -               ret = -EINVAL;
13 -               goto out;
14 -       }
15 -
16         ath_dbg(common, ATH_DBG_CONFIG,
17                 "Attach a VIF of type: %d\n", vif->type);
18  
19 @@ -1529,15 +1520,6 @@ static int ath9k_change_interface(struct
20         mutex_lock(&sc->mutex);
21         ath9k_ps_wakeup(sc);
22  
23 -       /* See if new interface type is valid. */
24 -       if ((new_type == NL80211_IFTYPE_ADHOC) &&
25 -           (sc->nvifs > 1)) {
26 -               ath_err(common, "When using ADHOC, it must be the only"
27 -                       " interface.\n");
28 -               ret = -EINVAL;
29 -               goto out;
30 -       }
31 -
32         if (ath9k_uses_beacons(new_type) &&
33             !ath9k_uses_beacons(vif->type)) {
34                 if (sc->nbcnvifs >= ATH_BCBUF) {