From patchwork Fri Jan 21 02:59:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 493591 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0L30Z5U004451 for ; Fri, 21 Jan 2011 03:00:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612Ab1AUDAe (ORCPT ); Thu, 20 Jan 2011 22:00:34 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:44780 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751209Ab1AUDAd (ORCPT ); Thu, 20 Jan 2011 22:00:33 -0500 Received: by mail-pz0-f46.google.com with SMTP id 35so218028pzk.19 for ; Thu, 20 Jan 2011 19:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:x-mailer:cc:subject; bh=vDBc7AmTWTZM4+UVg2WSFa9i1DJ2UCJBubnp8ew0Kyk=; b=oWE6ju2yd6V/z5ZCE787akwz/9rpvUUUpwh37D89jJwOQ5rZX1rqLgEEOLZZFqEBNj qWW04PItvzFOovAlVEqt5DbSHEW3q7+6O2I1gwZ9lxuAx7TpDp6pBO4B7dODWSqaB+5g iQ5cZr2u6yQPgHqtF7ztXx9tn+pKZqBeJLaQ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:x-mailer:cc:subject; b=v+EjiiBVDGFOaR4PCyB9QSEJ4GEyzE2kgSVqdTLtlaNHcz7/hh72aMf7gf68dNAKGs 3gR3cDsJdpPvidlVqFhipY+IziVHaAOPf4Rk6w2XTk5p1soFGgDNIqJ0pCt06y740kPG V/JCb2STFN/Z54iq2yc3haObBszPFlIonDBFU= Received: by 10.142.133.11 with SMTP id g11mr80586wfd.103.1295578833349; Thu, 20 Jan 2011 19:00:33 -0800 (PST) Received: from bodhi ([117.205.82.212]) by mx.google.com with ESMTPS id w22sm11984853wfd.19.2011.01.20.19.00.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 19:00:32 -0800 (PST) From: Sujith MIME-Version: 1.0 Message-ID: <19768.63139.963913.947597@gargle.gargle.HOWL> Date: Fri, 21 Jan 2011 08:29:47 +0530 To: linux-wireless@vger.kernel.org X-Mailer: VM 8.1.1 under 23.2.1 (x86_64-unknown-linux-gnu) CC: ath9k-devel@venema.h4ckr.net Subject: [RFC/WIP 05/33] ath9k_htc: Remove OP_PROTECT_ENABLE Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 21 Jan 2011 03:00:36 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 08ab28d..79b67a1 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -335,12 +335,11 @@ void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv); #define OP_SCANNING BIT(1) #define OP_LED_ASSOCIATED BIT(2) #define OP_LED_ON BIT(3) -#define OP_PROTECT_ENABLE BIT(4) -#define OP_ASSOCIATED BIT(5) -#define OP_ENABLE_BEACON BIT(6) -#define OP_LED_DEINIT BIT(7) -#define OP_BT_PRIORITY_DETECTED BIT(8) -#define OP_BT_SCAN BIT(9) +#define OP_ASSOCIATED BIT(4) +#define OP_ENABLE_BEACON BIT(5) +#define OP_LED_DEINIT BIT(6) +#define OP_BT_PRIORITY_DETECTED BIT(7) +#define OP_BT_SCAN BIT(8) struct ath9k_htc_priv { struct device *dev; diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 8e76589..fe6e0bb 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1521,16 +1521,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw, ath9k_htc_beacon_config(priv, vif); } - if (changed & BSS_CHANGED_ERP_CTS_PROT) { - ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n", - bss_conf->use_cts_prot); - if (bss_conf->use_cts_prot && - hw->conf.channel->band != IEEE80211_BAND_5GHZ) - priv->op_flags |= OP_PROTECT_ENABLE; - else - priv->op_flags &= ~OP_PROTECT_ENABLE; - } - if (changed & BSS_CHANGED_ERP_SLOT) { if (bss_conf->use_short_slot) ah->slottime = 9; diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index d5f0f41..884deeb 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c @@ -156,7 +156,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb) /* CTS-to-self */ if (!(flags & ATH9K_HTC_TX_RTSCTS) && - (priv->op_flags & OP_PROTECT_ENABLE)) + (vif && vif->bss_conf.use_cts_prot)) flags |= ATH9K_HTC_TX_CTSONLY; tx_hdr.flags = cpu_to_be32(flags);