aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>2012-06-06 01:03:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-11 14:29:14 -0400
commita23415fd7ed4bfa8e203ecf141d43da7180193af (patch)
tree80bd1b7b388ae87fe2f7486b4b62de89607f6193 /drivers/net/wireless
parent2031b4c2b4904f7448ab9e4bc6b9bf16e32709f5 (diff)
ath9k: remove incompatible IBSS interface check in change_iface
'cfg80211: fix interface combinations' ensures that if an interface type is not advertised by the driver in any of the interface combinations (via ieee80211_iface_combination) then it shall be treated as a single incompatible interface. if there are more than one interfaces present and changing them to incompatible interface type is not possible. These checks will be properly handled by cfg80211_change_iface -> cfg80211_can_change_interface. this patch is dependent on 'cfg80211: fix interface combinations' Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 08506f190f27..ac41f1e3ab9f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1467,15 +1467,6 @@ static int ath9k_change_interface(struct ieee80211_hw *hw,
1467 mutex_lock(&sc->mutex); 1467 mutex_lock(&sc->mutex);
1468 ath9k_ps_wakeup(sc); 1468 ath9k_ps_wakeup(sc);
1469 1469
1470 /* See if new interface type is valid. */
1471 if ((new_type == NL80211_IFTYPE_ADHOC) &&
1472 (sc->nvifs > 1)) {
1473 ath_err(common, "When using ADHOC, it must be the only"
1474 " interface.\n");
1475 ret = -EINVAL;
1476 goto out;
1477 }
1478
1479 if (ath9k_uses_beacons(new_type) && 1470 if (ath9k_uses_beacons(new_type) &&
1480 !ath9k_uses_beacons(vif->type)) { 1471 !ath9k_uses_beacons(vif->type)) {
1481 if (sc->nbcnvifs >= ATH_BCBUF) { 1472 if (sc->nbcnvifs >= ATH_BCBUF) {