---

yaml --- r: 220127 b: refs/heads/master c: d11a5c6 h: refs/heads/master i: 220125: 87935ed 220123: 53753bf 220119: 53786f6 220111: 51f62d0 220095: 18ba26e v: v3
git-mirror · Oct 6, 2010 · 4eba29e · 4eba29e
1 parent 3688192
commit 4eba29e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 172 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ddc6f46291b030523e4f6538e4ca3c5b75a15e0
+refs/heads/master: d11a5c6e683a76a1439b323194921c19e255ceac
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -42,7 +42,7 @@ ccflags-y :=			\
 	-Idrivers/staging/brcm80211/util
 
 DHDOFILES = dhd_linux.o linux_osl.o bcmutils.o dhd_common.o dhd_custom_gpio.o	\
-	wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o bcmwifi.o dhd_sdio.o	\
+	wl_iw.o wl_cfg80211.o ../util/siutils.o ../util/sbutils.o ../util/aiutils.o ../util/hndpmu.o ../util/bcmwifi.o dhd_sdio.o	\
 	dhd_linux_sched.o dhd_cdc.o bcmsdh_sdmmc.o bcmsdh.o bcmsdh_linux.o	\
 	bcmsdh_sdmmc_linux.o
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmwifi.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmwifi.c
diff --git a/trunk/drivers/staging/brcm80211/util/bcmwifi.c b/trunk/drivers/staging/brcm80211/util/bcmwifi.c
@@ -302,6 +302,22 @@ 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;
@@ -316,3 +332,4 @@ int wf_channel2mhz(uint ch, uint start_factor)
 
 	return freq;
 }
+#endif /* BRCM_FULLMAC */