diff mbox

[1/2] ath9k_htc: allow coexistence of IBSS with other modes

Message ID 1345968773-17166-1-git-send-email-ordex@autistici.org (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Antonio Quartulli Aug. 26, 2012, 8:12 a.m. UTC
Practical tests shown that ath9k_htc devices allow an IBSS VIF to coexist with
VIF set up on other modes. This patch removes the check which block the creation
of any other VIF whenever an IBSS one is already present.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 drivers/net/wireless/ath/ath9k/htc_drv_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Antonio Quartulli Aug. 26, 2012, 8:06 p.m. UTC | #1
On Sun, Aug 26, 2012 at 10:12:52AM +0200, Antonio Quartulli wrote:
> Practical tests shown that ath9k_htc devices allow an IBSS VIF to coexist with
> VIF set up on other modes. This patch removes the check which block the creation
> of any other VIF whenever an IBSS one is already present.
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>

Johannes, please drop this patch. I'll send Patch 1/2 again because I'll also
remove all the driver-specific checks for interface combinations.

Cheers,
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index c32f6e3..c41d85f 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1045,9 +1045,9 @@  static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
 		return -ENOBUFS;
 	}
 
-	if (priv->num_ibss_vif ||
-	    (priv->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) {
-		ath_err(common, "IBSS coexistence with other modes is not allowed\n");
+	if (priv->num_ibss_vif && vif->type == NL80211_IFTYPE_ADHOC) {
+		ath_err(common,
+			"IBSS coexistence with another IBSS is not allowed\n");
 		mutex_unlock(&priv->mutex);
 		return -ENOBUFS;
 	}