From patchwork Sun Aug 26 20:55:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1375821 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6F66ADFABE for ; Sun, 26 Aug 2012 20:55:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752509Ab2HZUzZ (ORCPT ); Sun, 26 Aug 2012 16:55:25 -0400 Received: from latitanza.investici.org ([82.94.249.234]:62224 "EHLO latitanza.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752142Ab2HZUzY (ORCPT ); Sun, 26 Aug 2012 16:55:24 -0400 Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 53DAF9805F; Sun, 26 Aug 2012 20:55:22 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 latitanza.investici.org 53DAF9805F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1346014523; bh=X54tactSdGhbjoEctvpkh7fS+y1dF5wSyJeSG9CCLJE=; h=From:To:Cc:Subject:Date:Message-Id; b=mk/VpEajLk50uCVVSNMK0/nyH3XPkFCo909Gu/wpW1JnCcWdJYSF7GxiTeLRWjlhS 7CTE4Os+p0tCKIZwZRNXbnQBT7sKhxh8JwKDYT14my9scW5wxiop7QwkfMbUlgfKQS 8fxLmNxLHz23u17RYP8bFmeQ3sC4pp/b2Gveldi4= From: Antonio Quartulli To: "Luis R. Rodriguez" , Sujith Manoharan Cc: ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org, Antonio Quartulli Subject: [PATCHv2 1/2] ath9k_htc: remove driver specific checks for interfaces combinations Date: Sun, 26 Aug 2012 22:55:04 +0200 Message-Id: <1346014505-7554-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.12 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Thanks to the new interface combinations code we can safely remove all the driver specific checks for unsupported modes. Signed-off-by: Antonio Quartulli --- this patch if v2 of "ath9k_htc: allow coexistence of IBSS with other modes". Now it is more generic. drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index c32f6e3..51c69f2 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1040,26 +1040,6 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, mutex_lock(&priv->mutex); - if (priv->nvifs >= ATH9K_HTC_MAX_VIF) { - mutex_unlock(&priv->mutex); - 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"); - mutex_unlock(&priv->mutex); - return -ENOBUFS; - } - - if (((vif->type == NL80211_IFTYPE_AP) || - (vif->type == NL80211_IFTYPE_ADHOC)) && - ((priv->num_ap_vif + priv->num_ibss_vif) >= ATH9K_HTC_MAX_BCN_VIF)) { - ath_err(common, "Max. number of beaconing interfaces reached\n"); - mutex_unlock(&priv->mutex); - return -ENOBUFS; - } - ath9k_htc_ps_wakeup(priv); memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif)); memcpy(&hvif.myaddr, vif->addr, ETH_ALEN);