2011-04-14 23:22:21 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
2012-03-10 12:59:28 +00:00
|
|
|
@@ -1432,15 +1432,6 @@ static int ath9k_add_interface(struct ie
|
2011-04-14 23:22:21 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-20 18:14:35 +00:00
|
|
|
- if ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
|
|
|
|
|
- ((vif->type == NL80211_IFTYPE_ADHOC) &&
|
|
|
|
|
- sc->nvifs > 0)) {
|
2011-04-14 23:22:21 +00:00
|
|
|
- ath_err(common, "Cannot create ADHOC interface when other"
|
|
|
|
|
- " interfaces already exist.\n");
|
|
|
|
|
- ret = -EINVAL;
|
|
|
|
|
- goto out;
|
|
|
|
|
- }
|
|
|
|
|
-
|
2012-02-07 11:28:11 +00:00
|
|
|
ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
|
2011-04-14 23:22:21 +00:00
|
|
|
|
2012-02-07 11:28:11 +00:00
|
|
|
sc->nvifs++;
|
2012-03-10 12:59:28 +00:00
|
|
|
@@ -1465,15 +1456,6 @@ static int ath9k_change_interface(struct
|
2011-04-20 18:14:35 +00:00
|
|
|
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) {
|
