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

Commit 9f96da4d authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents ccdbb6e9 b6b561c3

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6830,6 +6830,14 @@ L: linux-hexagon@vger.kernel.org 
S:	Supported

F:	arch/hexagon/



QUALCOMM WCN36XX WIRELESS DRIVER

M:	Eugene Krasnikov <k.eugene.e@gmail.com>

L:	wcn36xx@lists.infradead.org

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

T:	git git://github.com/KrasnikovEugene/wcn36xx.git

S:	Supported

F:	drivers/net/wireless/ath/wcn36xx/



QUICKCAM PARALLEL PORT WEBCAMS

M:	Hans Verkuil <hverkuil@xs4all.nl>

L:	linux-media@vger.kernel.org

drivers/bcma/host_pci.c

+6 −2
Original line number Diff line number Diff line
@@ -188,8 +188,11 @@ static int bcma_host_pci_probe(struct pci_dev *dev, 
		pci_write_config_dword(dev, 0x40, val & 0xffff00ff);



	/* SSB needed additional powering up, do we have any AMBA PCI cards? */

	if (!pci_is_pcie(dev))

		bcma_err(bus, "PCI card detected, report problems.\n");

	if (!pci_is_pcie(dev)) {

		bcma_err(bus, "PCI card detected, they are not supported.\n");

		err = -ENXIO;

		goto err_pci_release_regions;

	}



	/* Map MMIO */

	err = -ENOMEM;
@@ -269,6 +272,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, 


static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

drivers/net/wireless/ath/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ source "drivers/net/wireless/ath/ath6kl/Kconfig" 
source "drivers/net/wireless/ath/ar5523/Kconfig"

source "drivers/net/wireless/ath/wil6210/Kconfig"

source "drivers/net/wireless/ath/ath10k/Kconfig"

source "drivers/net/wireless/ath/wcn36xx/Kconfig"



endif

drivers/net/wireless/ath/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ obj-$(CONFIG_ATH6KL) += ath6kl/ 
obj-$(CONFIG_AR5523)		+= ar5523/

obj-$(CONFIG_WIL6210)		+= wil6210/

obj-$(CONFIG_ATH10K)		+= ath10k/

obj-$(CONFIG_WCN36XX)		+= wcn36xx/



obj-$(CONFIG_ATH_COMMON)	+= ath.o

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

+2 −4
Original line number Diff line number Diff line
@@ -338,10 +338,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
		    aniState->cckNoiseImmunityLevel !=

		    ATH9K_ANI_CCK_DEF_LEVEL) {

			ath_dbg(common, ANI,

				"Restore defaults: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",

				"Restore defaults: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",

				ah->opmode,

				chan->channel,

				chan->channelFlags,

				is_scanning,

				aniState->ofdmNoiseImmunityLevel,

				aniState->cckNoiseImmunityLevel);
@@ -354,10 +353,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
		 * restore historical levels for this channel

		 */

		ath_dbg(common, ANI,

			"Restore history: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",

			"Restore history: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",

			ah->opmode,

			chan->channel,

			chan->channelFlags,

			is_scanning,

			aniState->ofdmNoiseImmunityLevel,

			aniState->cckNoiseImmunityLevel);