Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 248544dc authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote-tracking branch 'wireless-next/master' into ath-next

parents d354181f 39731b78

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ F: Documentation/aoe/ 
F:	drivers/block/aoe/



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*
@@ -1443,7 +1443,7 @@ F: drivers/net/wireless/ath/* 
ATHEROS ATH5K WIRELESS DRIVER

M:	Jiri Slaby <jirislaby@gmail.com>

M:	Nick Kossifidis <mickflemm@gmail.com>

M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

L:	linux-wireless@vger.kernel.org

L:	ath5k-devel@lists.ath5k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath5k
@@ -8553,12 +8553,11 @@ S: Maintained 
F:	sound/soc/codecs/twl4030*



TI WILINK WIRELESS DRIVERS

M:	Luciano Coelho <luca@coelho.fi>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

W:	http://wireless.kernel.org/en/users/Drivers/wl1251

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/ti/

F:	include/linux/wl12xx.h

drivers/bcma/main.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static int bcma_register_cores(struct bcma_bus *bus) 
			bcma_err(bus,

				 "Could not register dev for core 0x%03X\n",

				 core->id.id);

			put_device(&core->dev);

			continue;

		}

		core->dev_registered = true;

drivers/net/wireless/ath/ath5k/dma.c

+10 −1
Original line number Diff line number Diff line
@@ -616,7 +616,16 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask) 
		 * SISRs will also clear PISR so no need to worry here.

		 */



		pisr_clear = pisr & ~AR5K_ISR_BITS_FROM_SISRS;

		/* XXX: There seems to be  an issue on some cards

		 *	with tx interrupt flags not being updated

		 *	on PISR despite that all Tx interrupt bits

		 * 	are cleared on SISRs. Since we handle all

		 *	Tx queues all together it shouldn't be an

		 *	issue if we clear Tx interrupt flags also

		 * 	on PISR to avoid that.

		 */

		pisr_clear = (pisr & ~AR5K_ISR_BITS_FROM_SISRS) |

					(pisr & AR5K_INT_TX_ALL);



		/*

		 * Write to clear them...

drivers/net/wireless/ath/ath6kl/wmi.c

+3 −3
Original line number Diff line number Diff line
@@ -2754,9 +2754,9 @@ static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx, 
				mask->control[band].legacy << 4;



		/* copy mcs rate mask */

		mcsrate = mask->control[band].mcs[1];

		mcsrate = mask->control[band].ht_mcs[1];

		mcsrate <<= 8;

		mcsrate |= mask->control[band].mcs[0];

		mcsrate |= mask->control[band].ht_mcs[0];

		ratemask[band] |= mcsrate << 12;

		ratemask[band] |= mcsrate << 28;

	}
@@ -2806,7 +2806,7 @@ static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx, 
				mask->control[band].legacy << 4;



		/* copy mcs rate mask */

		mcsrate = mask->control[band].mcs[0];

		mcsrate = mask->control[band].ht_mcs[0];

		ratemask[band] |= mcsrate << 12;

		ratemask[band] |= mcsrate << 20;

	}

drivers/net/wireless/ath/ath9k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -11,12 +11,14 @@ ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o 
ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o

ath9k-$(CONFIG_ATH9K_PCI) += pci.o

ath9k-$(CONFIG_ATH9K_AHB) += ahb.o

ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o

ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o

ath9k-$(CONFIG_ATH9K_TX99) += tx99.o

ath9k-$(CONFIG_ATH9K_WOW) += wow.o



ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o \

				 spectral.o



obj-$(CONFIG_ATH9K) += ath9k.o



ath9k_hw-y:=	\