From 88b3eaa499ddbe5a36c34840117563bd54ec4ec2 Mon Sep 17 00:00:00 2001 From: nohee ko Date: Mon, 11 Oct 2010 18:33:45 -0700 Subject: [PATCH] staging: brcm80211: remove duplicated function, wf_channel2mhz remove duplicated function, wf_channel2mhz Signed-off-by: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/util/bcmwifi.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c index c51fea048a42..37c26af42a9d 100644 --- a/drivers/staging/brcm80211/util/bcmwifi.c +++ b/drivers/staging/brcm80211/util/bcmwifi.c @@ -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 */