Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (d7ffd588) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/net/wireless/ath/ath9k/common-beacon.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah,
	struct ath9k_beacon_state *bs)		struct ath9k_beacon_state *bs)
	{		{
	struct ath_common *common = ath9k_hw_common(ah);		struct ath_common *common = ath9k_hw_common(ah);
	int dtim_intval, sleepduration;		int dtim_intval;
	u64 tsf;		u64 tsf;

	/* No need to configure beacon if we are not associated */		/* No need to configure beacon if we are not associated */
	@@ -75,7 +75,6 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah,
	* last beacon we received (which may be none).		* last beacon we received (which may be none).
	*/		*/
	dtim_intval = conf->intval * conf->dtim_period;		dtim_intval = conf->intval * conf->dtim_period;
	sleepduration = ah->hw->conf.listen_interval * conf->intval;

	/*		/*
	* Pull nexttbtt forward to reflect the current		* Pull nexttbtt forward to reflect the current
	@@ -113,7 +112,7 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah,
	*/		*/

	bs->bs_sleepduration = TU_TO_USEC(roundup(IEEE80211_MS_TO_TU(100),		bs->bs_sleepduration = TU_TO_USEC(roundup(IEEE80211_MS_TO_TU(100),
	sleepduration));		conf->intval));
	if (bs->bs_sleepduration > bs->bs_dtimperiod)		if (bs->bs_sleepduration > bs->bs_dtimperiod)
	bs->bs_sleepduration = bs->bs_dtimperiod;		bs->bs_sleepduration = bs->bs_dtimperiod;

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -978,7 +978,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
	struct ath_hw *ah = common->ah;		struct ath_hw *ah = common->ah;
	struct ath_htc_rx_status *rxstatus;		struct ath_htc_rx_status *rxstatus;
	struct ath_rx_status rx_stats;		struct ath_rx_status rx_stats;
	bool decrypt_error;		bool decrypt_error = false;

	if (skb->len < HTC_RX_FRAME_HEADER_SIZE) {		if (skb->len < HTC_RX_FRAME_HEADER_SIZE) {
	ath_err(common, "Corrupted RX frame, dropping (len: %d)\n",		ath_err(common, "Corrupted RX frame, dropping (len: %d)\n",

drivers/net/wireless/ath/ath9k/main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -502,7 +502,7 @@ irqreturn_t ath_isr(int irq, void *dev)
	* touch anything. Note this can happen early		* touch anything. Note this can happen early
	* on if the IRQ is shared.		* on if the IRQ is shared.
	*/		*/
	if (test_bit(ATH_OP_INVALID, &common->op_flags))		if (!ah \|\| test_bit(ATH_OP_INVALID, &common->op_flags))
	return IRQ_NONE;		return IRQ_NONE;

	/* shared irq, not for us */		/* shared irq, not for us */

drivers/net/wireless/brcm80211/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,10 +27,17 @@ config BRCMFMAC
	one of the bus interface support. If you choose to build a module,		one of the bus interface support. If you choose to build a module,
	it'll be called brcmfmac.ko.		it'll be called brcmfmac.ko.

			config BRCMFMAC_PROTO_BCDC
			bool

			config BRCMFMAC_PROTO_MSGBUF
			bool

	config BRCMFMAC_SDIO		config BRCMFMAC_SDIO
	bool "SDIO bus interface support for FullMAC driver"		bool "SDIO bus interface support for FullMAC driver"
	depends on (MMC = y \|\| MMC = BRCMFMAC)		depends on (MMC = y \|\| MMC = BRCMFMAC)
	depends on BRCMFMAC		depends on BRCMFMAC
			select BRCMFMAC_PROTO_BCDC
	select FW_LOADER		select FW_LOADER
	default y		default y
	---help---		---help---
	@@ -42,6 +49,7 @@ config BRCMFMAC_USB
	bool "USB bus interface support for FullMAC driver"		bool "USB bus interface support for FullMAC driver"
	depends on (USB = y \|\| USB = BRCMFMAC)		depends on (USB = y \|\| USB = BRCMFMAC)
	depends on BRCMFMAC		depends on BRCMFMAC
			select BRCMFMAC_PROTO_BCDC
	select FW_LOADER		select FW_LOADER
	---help---		---help---
	This option enables the USB bus interface support for Broadcom		This option enables the USB bus interface support for Broadcom
	@@ -52,6 +60,8 @@ config BRCMFMAC_PCIE
	bool "PCIE bus interface support for FullMAC driver"		bool "PCIE bus interface support for FullMAC driver"
	depends on BRCMFMAC		depends on BRCMFMAC
	depends on PCI		depends on PCI
			depends on HAS_DMA
			select BRCMFMAC_PROTO_MSGBUF
	select FW_LOADER		select FW_LOADER
	---help---		---help---
	This option enables the PCIE bus interface support for Broadcom		This option enables the PCIE bus interface support for Broadcom

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -30,16 +30,18 @@ brcmfmac-objs += \
	fwsignal.o \		fwsignal.o \
	p2p.o \		p2p.o \
	proto.o \		proto.o \
	bcdc.o \
	commonring.o \
	flowring.o \
	msgbuf.o \
	dhd_common.o \		dhd_common.o \
	dhd_linux.o \		dhd_linux.o \
	firmware.o \		firmware.o \
	feature.o \		feature.o \
	btcoex.o \		btcoex.o \
	vendor.o		vendor.o
			brcmfmac-$(CONFIG_BRCMFMAC_PROTO_BCDC) += \
			bcdc.o
			brcmfmac-$(CONFIG_BRCMFMAC_PROTO_MSGBUF) += \
			commonring.o \
			flowring.o \
			msgbuf.o
	brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \		brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
	dhd_sdio.o \		dhd_sdio.o \
	bcmsdh.o		bcmsdh.o