From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.atheros.com ([12.36.123.2]:25159 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752653AbYLVSV2 (ORCPT ); Mon, 22 Dec 2008 13:21:28 -0500 Received: from mail.atheros.com ([10.10.20.108]) by sidewinder.atheros.com for ; Mon, 22 Dec 2008 10:21:28 -0800 From: "Luis R. Rodriguez" To: , CC: "Luis R. Rodriguez" , , Subject: [PATCH v2 16/18] ath9k: remove ath9k_hw_check_chan() Date: Mon, 22 Dec 2008 10:20:37 -0800 Message-ID: <1229970039-10561-17-git-send-email-lrodriguez@atheros.com> (sfid-20081222_193906_018421_65D3176F) In-Reply-To: <1229970039-10561-16-git-send-email-lrodriguez@atheros.com> References: <1229970039-10561-1-git-send-email-lrodriguez@atheros.com> <1229970039-10561-2-git-send-email-lrodriguez@atheros.com> <1229970039-10561-3-git-send-email-lrodriguez@atheros.com> <1229970039-10561-4-git-send-email-lrodriguez@atheros.com> <1229970039-10561-5-git-send-email-lrodriguez@atheros.com> <1229970039-10561-6-git-send-email-lrodriguez@atheros.com> <1229970039-10561-7-git-send-email-lrodriguez@atheros.com> <1229970039-10561-8-git-send-email-lrodriguez@atheros.com> <1229970039-10561-9-git-send-email-lrodriguez@atheros.com> <1229970039-10561-10-git-send-email-lrodriguez@atheros.com> <1229970039-10561-11-git-send-email-lrodriguez@atheros.com> <1229970039-10561-12-git-send-email-lrodriguez@atheros.com> <1229970039-10561-13-git-send-email-lrodriguez@atheros.com> <1229970039-10561-14-git-send-email-lrodriguez@atheros.com> <1229970039-10561-15-git-send-email-lrodriguez@atheros.com> <1229970039-10561-16-git-send-email-lrodriguez@atheros.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: The only check we care about in ath9k_hw_check_chan() is the internal regulatory check so use that. Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/hw.c | 30 +++--------------------------- 1 files changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index 436fbc8..7d5ca81 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c @@ -1627,30 +1627,6 @@ static bool ath9k_hw_chip_reset(struct ath_hal *ah, return true; } -static struct ath9k_channel *ath9k_hw_check_chan(struct ath_hal *ah, - struct ath9k_channel *chan) -{ - if (!(IS_CHAN_2GHZ(chan) ^ IS_CHAN_5GHZ(chan))) { - DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL, - "invalid channel %u/0x%x; not marked as " - "2GHz or 5GHz\n", chan->channel, chan->channelFlags); - return NULL; - } - - if (!IS_CHAN_OFDM(chan) && - !IS_CHAN_B(chan) && - !IS_CHAN_HT20(chan) && - !IS_CHAN_HT40(chan)) { - DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL, - "invalid channel %u/0x%x; not marked as " - "OFDM or CCK or HT20 or HT40PLUS or HT40MINUS\n", - chan->channel, chan->channelFlags); - return NULL; - } - - return ath9k_regd_check_channel(ah, chan); -} - static bool ath9k_hw_channel_change(struct ath_hal *ah, struct ath9k_channel *chan, enum ath9k_ht_macmode macmode) @@ -2203,10 +2179,10 @@ int ath9k_hw_reset(struct ath_hal *ah, bool bChannelChange) ahp->ah_rxchainmask &= 0x3; } - if (ath9k_hw_check_chan(ah, chan) == NULL) { + if (ath9k_regd_check_channel(ah, chan) == NULL) { DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL, - "invalid channel %u/0x%x; no mapping\n", - chan->channel, chan->channelFlags); + "invalid channel %u; no mapping\n", + channel->center_freq); return -EINVAL; } -- 1.6.1.rc3.51.g5832d