brcm80211: removed unused functions (f53b170f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/brcm80211/brcmsmac/stf.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@
		#define BRCMS_STF_SS_STBC_RX(wlc) (BRCMS_ISNPHY(wlc->band) && \
		NREV_GT(wlc->band->phyrev, 3) && NREV_LE(wlc->band->phyrev, 6))

		#define BRCMS_BITSCNT(x) brcmu_bitcount((u8 *)&(x), sizeof(u8))

		#define NSTS_1 1
		#define NSTS_2 2
		#define NSTS_3 3

drivers/net/wireless/brcm80211/brcmutil/utils.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -584,17 +584,3 @@ u8 brcmu_mw_to_qdbm(u16 mw)
		}
		EXPORT_SYMBOL(brcmu_mw_to_qdbm);

		uint brcmu_bitcount(u8 *bitmap, uint length)
		{
		uint bitcount = 0, i;
		u8 tmp;
		for (i = 0; i < length; i++) {
		tmp = bitmap[i];
		while (tmp) {
		bitcount++;
		tmp &= (tmp - 1);
		}
		}
		return bitcount;
		}
		EXPORT_SYMBOL(brcmu_bitcount);

drivers/net/wireless/brcm80211/brcmutil/wifi.c

+0 −93

Original line number	Diff line number	Diff line
		@@ -41,96 +41,3 @@ bool brcmu_chspec_malformed(u16 chanspec)
		return false;
		}
		EXPORT_SYMBOL(brcmu_chspec_malformed);

		/*
		* This function returns the channel number that control traffic is being sent
		* on, for legacy channels this is just the channel number, for 40MHZ channels
		* it is the upper or lower 20MHZ sideband depending on the chanspec selected.
		*/
		u8 brcmu_chspec_ctlchan(u16 chspec)
		{
		u8 ctl_chan;

		/* Is there a sideband ? */
		if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_NONE) {
		return CHSPEC_CHANNEL(chspec);
		} else {
		/*
		* we only support 40MHZ with sidebands. chanspec channel holds
		* the centre frequency, use that and the side band information
		* to reconstruct the control channel number
		*/
		if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_UPPER)
		/*
		* control chan is the upper 20 MHZ SB of the
		* 40MHZ channel
		*/
		ctl_chan = upper_20_sb(CHSPEC_CHANNEL(chspec));
		else
		/*
		* control chan is the lower 20 MHZ SB of the
		* 40MHZ channel
		*/
		ctl_chan = lower_20_sb(CHSPEC_CHANNEL(chspec));
		}

		return ctl_chan;
		}
		EXPORT_SYMBOL(brcmu_chspec_ctlchan);

		/*
		* Return the channel number for a given frequency and base frequency.
		* The returned channel number is relative to the given base frequency.
		* If the given base frequency is zero, a base frequency of 5 GHz is assumed for
		* frequencies from 5 - 6 GHz, and 2.407 GHz is assumed for 2.4 - 2.5 GHz.
		*
		* Frequency is specified in MHz.
		* The base frequency is specified as (start_factor * 500 kHz).
		* Constants WF_CHAN_FACTOR_2_4_G, WF_CHAN_FACTOR_5_G are defined for
		* 2.4 GHz and 5 GHz bands.
		*
		* The returned channel will be in the range [1, 14] in the 2.4 GHz band
		* and [0, 200] otherwise.
		* -1 is returned if the start_factor is WF_CHAN_FACTOR_2_4_G and the
		* frequency is not a 2.4 GHz channel, or if the frequency is not and even
		* multiple of 5 MHz from the base frequency to the base plus 1 GHz.
		*
		* Reference 802.11 REVma, section 17.3.8.3, and 802.11B section 18.4.6.2
		*/
		int brcmu_mhz2channel(uint freq, uint start_factor)
		{
		int ch = -1;
		uint base;
		int offset;

		/* take the default channel start frequency */
		if (start_factor == 0) {
		if (freq >= 2400 && freq <= 2500)
		start_factor = WF_CHAN_FACTOR_2_4_G;
		else if (freq >= 5000 && freq <= 6000)
		start_factor = WF_CHAN_FACTOR_5_G;
		}

		if (freq == 2484 && start_factor == WF_CHAN_FACTOR_2_4_G)
		return 14;

		base = start_factor / 2;

		/* check that the frequency is in 1GHz range of the base */
		if ((freq < base) \|\| (freq > base + 1000))
		return -1;

		offset = freq - base;
		ch = offset / 5;

		/* check that frequency is a 5MHz multiple from the base */
		if (offset != (ch * 5))
		return -1;

		/* restricted channel range check for 2.4G */
		if (start_factor == WF_CHAN_FACTOR_2_4_G && (ch < 1 \|\| ch > 13))
		return -1;

		return ch;
		}
		EXPORT_SYMBOL(brcmu_mhz2channel);

drivers/net/wireless/brcm80211/include/brcmu_utils.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -218,6 +218,5 @@ extern u8 brcmu_mw_to_qdbm(u16 mw);

		extern uint brcmu_mkiovar(char name, char data, uint datalen,
		char *buf, uint len);
		extern uint brcmu_bitcount(u8 *bitmap, uint bytelength);

		#endif /* _BRCMU_UTILS_H_ */

drivers/net/wireless/brcm80211/include/brcmu_wifi.h

+0 −28

Original line number	Diff line number	Diff line
		@@ -176,34 +176,6 @@ static inline bool ac_bitmap_tst(u8 bitmap, int prec)
		*/
		extern bool brcmu_chspec_malformed(u16 chanspec);

		/*
		* This function returns the channel number that control traffic is being sent
		* on, for legacy channels this is just the channel number, for 40MHZ channels
		* it is the upper or lower 20MHZ sideband depending on the chanspec selected.
		*/
		extern u8 brcmu_chspec_ctlchan(u16 chspec);

		/*
		* Return the channel number for a given frequency and base frequency.
		* The returned channel number is relative to the given base frequency.
		* If the given base frequency is zero, a base frequency of 5 GHz is assumed for
		* frequencies from 5 - 6 GHz, and 2.407 GHz is assumed for 2.4 - 2.5 GHz.
		*
		* Frequency is specified in MHz.
		* The base frequency is specified as (start_factor * 500 kHz).
		* Constants WF_CHAN_FACTOR_2_4_G, WF_CHAN_FACTOR_5_G are defined for
		* 2.4 GHz and 5 GHz bands.
		*
		* The returned channel will be in the range [1, 14] in the 2.4 GHz band
		* and [0, 200] otherwise.
		* -1 is returned if the start_factor is WF_CHAN_FACTOR_2_4_G and the
		* frequency is not a 2.4 GHz channel, or if the frequency is not and even
		* multiple of 5 MHz from the base frequency to the base plus 1 GHz.
		*
		* Reference 802.11 REVma, section 17.3.8.3, and 802.11B section 18.4.6.2
		*/
		extern int brcmu_mhz2channel(uint freq, uint start_factor);

		/* Enumerate crypto algorithms */
		#define CRYPTO_ALGO_OFF 0
		#define CRYPTO_ALGO_WEP1 1