Return-path: Received: from youngberry.canonical.com ([91.189.89.112]:42259 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965301Ab2FAQPm (ORCPT ); Fri, 1 Jun 2012 12:15:42 -0400 From: Seth Forshee To: Arend van Spriel , linux-wireless@vger.kernel.org Cc: Brett Rudley , Roland Vossen , "Franky (Zhenhui) Lin" , Kan Yan , Pieter-Paul Giesberts , "John W. Linville" Subject: [PATCH 01/10] brcm80211: smac: don't set up tx power limits during initialization Date: Fri, 1 Jun 2012 11:15:27 -0500 Message-Id: <1338567336-12076-2-git-send-email-seth.forshee@canonical.com> (sfid-20120601_181546_747405_7DC375E1) In-Reply-To: <1338567336-12076-1-git-send-email-seth.forshee@canonical.com> References: <1338567336-12076-1-git-send-email-seth.forshee@canonical.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: This code is unnecessary, and in fact it's never executed because the interface is never up when brcms_c_channels_commit() is called. Removing it helps simplify the implementation of proper regulatory support. Reviewed-by: Arend Van Spriel Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Brett Rudley Signed-off-by: Seth Forshee --- drivers/net/wireless/brcm80211/brcmsmac/channel.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c index eb77ac3..049d78f 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c @@ -908,7 +908,6 @@ static void brcms_c_channels_commit(struct brcms_cm_info *wlc_cm) { struct brcms_c_info *wlc = wlc_cm->wlc; uint chan; - struct txpwr_limits txpwr; /* search for the existence of any valid channel */ for (chan = 0; chan < MAXCHANNEL; chan++) { @@ -949,13 +948,6 @@ static void brcms_c_channels_commit(struct brcms_cm_info *wlc_cm) wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi, brcms_c_japan(wlc) ? true : false); - - if (wlc->pub->up && chan != INVCHANNEL) { - brcms_c_channel_reg_limits(wlc_cm, wlc->chanspec, &txpwr); - brcms_c_channel_min_txpower_limits_with_local_constraint(wlc_cm, - &txpwr, BRCMS_TXPWR_MAX); - wlc_phy_txpower_limit_set(wlc->band->pi, &txpwr, wlc->chanspec); - } } static int -- 1.7.9.5