]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
staging: brcm80211: remove duplicated function, wf_channel2mhz
authornohee ko <noheek@broadcom.com>
Tue, 12 Oct 2010 01:33:45 +0000 (18:33 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 12 Oct 2010 16:03:28 +0000 (09:03 -0700)
remove duplicated function, wf_channel2mhz

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/util/bcmwifi.c

index c51fea048a42d00f23f4ac78197d95238f7ca505..37c26af42a9dd8c2772553be2e2e57eb5092af52 100644 (file)
@@ -176,22 +176,6 @@ int wf_mhz2channel(uint freq, uint start_factor)
  *
  * Reference 802.11 REVma, section 17.3.8.3, and 802.11B section 18.4.6.2
  */
-#ifdef BRCM_FULLMAC
-int wf_channel2mhz(uint ch, uint start_factor)
-{
-       int freq;
-
-       if ((start_factor == WF_CHAN_FACTOR_2_4_G && (ch < 1 || ch > 14)) ||
-       (ch <= 200))
-               freq = -1;
-       if ((start_factor == WF_CHAN_FACTOR_2_4_G) && (ch == 14))
-               freq = 2484;
-       else
-               freq = ch * 5 + start_factor / 2;
-
-       return freq;
-}
-#else /* !BRCM_FULLMAC */
 int wf_channel2mhz(uint ch, uint start_factor)
 {
        int freq;
@@ -206,4 +190,3 @@ int wf_channel2mhz(uint ch, uint start_factor)
 
        return freq;
 }
-#endif /* BRCM_FULLMAC */