From patchwork Mon Aug 13 15:23:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shajakhan, Mohammed" X-Patchwork-Id: 1313481 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7F1743FC81 for ; Mon, 13 Aug 2012 15:23:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751490Ab2HMPXc (ORCPT ); Mon, 13 Aug 2012 11:23:32 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:21397 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401Ab2HMPXZ (ORCPT ); Mon, 13 Aug 2012 11:23:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1344871406; x=1376407406; h=from:to:cc:subject:date:message-id:mime-version; bh=8NN00l95T5iX3ULjlt5U0gUSmGaoQkmXDl3zhRl9HVc=; b=wp38Z2qO8sjfs4M/CeJVauUTehE+ldQaFJom786Gx4R/bIVNwga0m6Ys IpQTVeYq9mhO3fsj7EiEWg09A7EGX/wK4fDRTZkbHQA0KDnY9Ft8ueOYY oHk0Nw9Y3CFCP7rMb9nZnrHzafFV6xwKF6BQnvVLvA9lJ3r+6auVBS7Q9 s=; X-IronPort-AV: E=McAfee;i="5400,1158,6801"; a="222435509" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine02.qualcomm.com with ESMTP; 13 Aug 2012 08:23:25 -0700 X-IronPort-AV: E=Sophos;i="4.77,761,1336374000"; d="scan'208";a="367579285" Received: from nasanexhc08.na.qualcomm.com ([172.30.39.7]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 13 Aug 2012 08:23:25 -0700 Received: from qcmail1.qualcomm.com (172.30.39.5) by qcmail1.qualcomm.com (172.30.39.7) with Microsoft SMTP Server (TLS) id 14.2.309.2; Mon, 13 Aug 2012 08:23:20 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Mon, 13 Aug 2012 20:53:14 +0530 From: Mohammed Shafi Shajakhan To: "John W. Linville" CC: , Rodriguez Luis , , Mohammed Shafi Shajakhan Subject: [RFC 3/3] ath9k_htc: Remove interface combination specific checks Date: Mon, 13 Aug 2012 20:53:12 +0530 Message-ID: <1344871392-6642-1-git-send-email-mohammed@qca.qualcomm.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-Originating-IP: [172.30.39.5] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mohammed Shafi Shajakhan Once the driver advertizes interface combination logic based on its firmware/hardware limitation, cfg80211 takes care of all the necessary logic such as maximum beaconing vifs, standlone interface etc. Signed-off-by: Mohammed Shafi Shajakhan --- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 20 -------------------- 1 files changed, 0 insertions(+), 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 c785129..a37ae41 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1038,26 +1038,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);