Merge remote-tracking branch 'wireless-next/master' into mac80211-next (b1fbd469) · Commits · e / devices / android_kernel_sony_msm8998

MAINTAINERS

+11 −2

Original line number	Diff line number	Diff line
		@@ -1595,6 +1595,7 @@ M: Arend van Spriel <arend@broadcom.com>
		M: Franky (Zhenhui) Lin <frankyl@broadcom.com>
		M: Kan Yan <kanyan@broadcom.com>
		L: linux-wireless@vger.kernel.org
		L: brcm80211-dev-list@broadcom.com
		S: Supported
		F: drivers/net/wireless/brcm80211/

		@@ -1800,6 +1801,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
		@@ -4340,7 +4344,8 @@ MAC80211
		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/linville/wireless.git
		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
		@@ -4351,7 +4356,8 @@ M: Stefano Brivio <stefano.brivio@polimi.it>
		M: Mattias Nissler <mattias.nissler@gmx.de>
		L: linux-wireless@vger.kernel.org
		W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
		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*

		@@ -5695,6 +5701,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/

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/scan.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,12 @@ static const struct bcma_device_id_name bcma_arm_device_names[] = {

		static const struct bcma_device_id_name bcma_bcm_device_names[] = {
		{ BCMA_CORE_OOB_ROUTER, "OOB Router" },
		{ BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
		{ BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
		{ BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
		{ BCMA_CORE_AMEMC, "AMEMC (DDR)" },
		{ BCMA_CORE_ALTA, "ALTA (I2S)" },
		{ BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
		{ BCMA_CORE_INVALID, "Invalid" },
		{ BCMA_CORE_CHIPCOMMON, "ChipCommon" },
		{ BCMA_CORE_ILINE20, "ILine 20" },

drivers/bluetooth/bluecard_cs.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -231,12 +231,12 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
		}

		do {
		register unsigned int iobase = info->p_dev->resource[0]->start;
		register unsigned int offset;
		register unsigned char command;
		register unsigned long ready_bit;
		unsigned int iobase = info->p_dev->resource[0]->start;
		unsigned int offset;
		unsigned char command;
		unsigned long ready_bit;
		register struct sk_buff *skb;
		register int len;
		int len;

		clear_bit(XMIT_WAKEUP, &(info->tx_state));

drivers/bluetooth/bpa10x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ static int bpa10x_probe(struct usb_interface intf, const struct usb_device_id
		hdev->flush = bpa10x_flush;
		hdev->send = bpa10x_send_frame;

		set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
		set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);

		err = hci_register_dev(hdev);
		if (err < 0) {