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

Commit 66fc5dff authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 9915672d e476a5a4

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

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ bool ath_stoprecv(struct ath_softc *sc) 
	bool stopped;



	spin_lock_bh(&sc->rx.rxbuflock);

	ath9k_hw_stoppcurecv(ah);

	ath9k_hw_abortpcurecv(ah);

	ath9k_hw_setrxfilter(ah, 0);

	stopped = ath9k_hw_stopdmarecv(ah);

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

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw, 
	}



unlock:

	if (err && (vif_id != -1)) {

	if (err && (vif_id >= 0)) {

		vif_priv->active = false;

		bitmap_release_region(&ar->vif_bitmap, vif_id, 0);

		ar->vifs--;

drivers/net/wireless/b43/sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_func *func, 
err_free_ssb:

	kfree(sdio);

err_disable_func:

	sdio_claim_host(func);

	sdio_disable_func(func);

err_release_host:

	sdio_release_host(func);

drivers/ssb/b43_pci_bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC,  0x4318) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2047,6 +2047,7 @@ 
#define PCI_DEVICE_ID_AFAVLAB_P030	0x2182

#define PCI_SUBDEVICE_ID_AFAVLAB_P061		0x2150



#define PCI_VENDOR_ID_BCM_GVC          0x14a4

#define PCI_VENDOR_ID_BROADCOM		0x14e4

#define PCI_DEVICE_ID_TIGON3_5752	0x1600

#define PCI_DEVICE_ID_TIGON3_5752M	0x1601