brcm80211: smac: don't set up tx power limits during initialization

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 <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index eb77ac3cfb6b8cb227062a352552300681a32e43..049d78fce103af5b7d8fa660a364208d07d4caf2 100644 (file)
--- 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