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

Commit 627ae3dd authored by Johannes Berg's avatar Johannes Berg
Browse files

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

parents 7bc057ff a59f975a

MAINTAINERS

+19 −11
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ F: drivers/hwmon/adm1029.c 


ADM8211 WIRELESS DRIVER

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

S:	Orphan

F:	drivers/net/wireless/adm8211.*
@@ -1423,7 +1423,7 @@ B43 WIRELESS DRIVER 
M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

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

S:	Maintained

F:	drivers/net/wireless/b43/
@@ -1432,7 +1432,7 @@ M: Larry Finger <Larry.Finger@lwfinger.net> 
M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

L:	b43-dev@lists.infradead.org

W:	http://linuxwireless.org/en/users/Drivers/b43

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

S:	Maintained

F:	drivers/net/wireless/b43legacy/
@@ -1800,6 +1800,9 @@ F: include/linux/cfag12864b.h 
CFG80211 and NL80211

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	include/linux/nl80211.h

F:	include/net/cfg80211.h
@@ -4339,8 +4342,9 @@ F: arch/m68k/hp300/ 
MAC80211

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/networking/mac80211-injection.txt

F:	include/net/mac80211.h
@@ -4350,8 +4354,9 @@ MAC80211 PID RATE CONTROL 
M:	Stefano Brivio <stefano.brivio@polimi.it>

M:	Mattias Nissler <mattias.nissler@gmx.de>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git

W:	http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	net/mac80211/rc80211_pid*
@@ -5027,7 +5032,7 @@ F: fs/ocfs2/ 


ORINOCO DRIVER

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/users/Drivers/orinoco

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

W:	http://www.nongnu.org/orinoco/

S:	Orphan

F:	drivers/net/wireless/orinoco/
@@ -5695,6 +5700,9 @@ F: include/linux/remoteproc.h 
RFKILL

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	Documentation/rfkill.txt

F:	net/rfkill/
@@ -5729,7 +5737,7 @@ F: net/rose/ 
RTL8180 WIRELESS DRIVER

M:	"John W. Linville" <linville@tuxdriver.com>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8180/
@@ -5739,7 +5747,7 @@ M: Herton Ronaldo Krzesinski <herton@canonical.com> 
M:	Hin-Tak Leung <htl10@users.sourceforge.net>

M:	Larry Finger <Larry.Finger@lwfinger.net>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8187/
@@ -5748,7 +5756,7 @@ RTL8192CE WIRELESS DRIVER 
M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Chaoming Li <chaoming_li@realsil.com.cn>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

W:	http://wireless.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtlwifi/

drivers/bcma/driver_chipcommon_pmu.c

+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 
		bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7);

		break;

	case 0x4331:

		/* BCM4331 workaround is SPROM-related, we put it in sprom.c */

	case 43431:

		/* Ext PA lines must be enabled for tx on BCM4331 */

		bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true);

		break;

	case 43224:

		if (bus->chipinfo.rev == 0) {

drivers/bcma/driver_pci.c

+4 −2
Original line number Diff line number Diff line
@@ -232,17 +232,19 @@ void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc) 
int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc, struct bcma_device *core,

			  bool enable)

{

	struct pci_dev *pdev = pc->core->bus->host_pci;

	struct pci_dev *pdev;

	u32 coremask, tmp;

	int err = 0;



	if (core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

	if (!pc || core->bus->hosttype != BCMA_HOSTTYPE_PCI) {

		/* This bcma device is not on a PCI host-bus. So the IRQs are

		 * not routed through the PCI core.

		 * So we must not enable routing through the PCI core. */

		goto out;

	}



	pdev = pc->core->bus->host_pci;



	err = pci_read_config_dword(pdev, BCMA_PCI_IRQMASK, &tmp);

	if (err)

		goto out;

drivers/bcma/sprom.c

+2 −2
Original line number Diff line number Diff line
@@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus) 
	if (!sprom)

		return -ENOMEM;



	if (bus->chipinfo.id == 0x4331)

	if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)

		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);



	pr_debug("SPROM offset 0x%x\n", offset);

	bcma_sprom_read(bus, offset, sprom);



	if (bus->chipinfo.id == 0x4331)

	if (bus->chipinfo.id == 0x4331 || bus->chipinfo.id == 43431)

		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);



	err = bcma_sprom_valid(sprom);

drivers/net/wireless/ath/ath9k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ ath9k-y += beacon.o \ 
		init.o \

		main.o \

		recv.o \

		xmit.o

		xmit.o \

		link.o \

		antenna.o



ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o

ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o