From: Rajkumar Manoharan Date: Mon, 4 Apr 2011 17:26:16 +0000 (+0530) Subject: ath9k: deny new interface addtion on IBSS mode X-Git-Tag: v3.0-rc2~7^2~16^2~522 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=59575d1c717815d62f1b5aeac74e5e60a1b27428;p=~emulex%2Finfiniband.git ath9k: deny new interface addtion on IBSS mode The present check denies the IBSS interface addtion if we already have any other vifs. But it fails to deny interface addition if IBSS was already present. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 3c5de73dcb4..88073f4c2b6 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1479,8 +1479,9 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, } } - 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;