3 files changed, 3 insertions, 30 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.h b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
index 30a202b258b5..116493671f88 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.h
@@ -112,30 +112,6 @@ int bcm43xx_channel_to_freq(struct bcm43xx_private *bcm,
         return bcm43xx_channel_to_freq_bg(channel);
 }
 
-/* Lightweight function to check if a channel number is valid.
- * Note that this does _NOT_ check for geographical restrictions!
- */
-static inline
-int bcm43xx_is_valid_channel_a(u8 channel)
-{
-        return (channel >= IEEE80211_52GHZ_MIN_CHANNEL
-               && channel <= IEEE80211_52GHZ_MAX_CHANNEL);
-}
-static inline
-int bcm43xx_is_valid_channel_bg(u8 channel)
-{
-        return (channel >= IEEE80211_24GHZ_MIN_CHANNEL
-               && channel <= IEEE80211_24GHZ_MAX_CHANNEL);
-}
-static inline
-int bcm43xx_is_valid_channel(struct bcm43xx_private *bcm,
-                             u8 channel)
-{
-        if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
-                return bcm43xx_is_valid_channel_a(channel);
-        return bcm43xx_is_valid_channel_bg(channel);
-}
-
 void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf);
 void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf);
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index af5c0bff1696..bb9c484d7e19 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1594,11 +1594,11 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
         u16 r8, tmp;
         u16 freq;
 
+        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
+                return -EINVAL;
         if ((radio->manufact == 0x17F) &&
             (radio->version == 0x2060) &&
             (radio->revision == 1)) {
-                if (channel > 200)
-                        return -EINVAL;
                 freq = channel2freq_a(channel);
 
                 r8 = bcm43xx_radio_read16(bcm, 0x0008);
@@ -1651,9 +1651,6 @@ int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
                 TODO(); //TODO: TSSI2dbm workaround
                 bcm43xx_phy_xmitpower(bcm);//FIXME correct?
         } else {
-                if ((channel < 1) || (channel > 14))
-                        return -EINVAL;
-
                 if (synthetic_pu_workaround)
                         bcm43xx_synth_pu_workaround(bcm, channel);
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index c35cb3a0777e..5c36e29efff7 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -119,7 +119,7 @@ static int bcm43xx_wx_set_channelfreq(struct net_device *net_dev,
                 channel = bcm43xx_freq_to_channel(bcm, data->freq.m);
                 freq = data->freq.m;
         }
-        if (!bcm43xx_is_valid_channel(bcm, channel))
+        if (!ieee80211_is_valid_channel(bcm->ieee, channel))
                 goto out_unlock;
         if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
                 //ieee80211softmac_disassoc(softmac, $REASON);