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

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

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

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h
parents 689b66cb 2e1253d6

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -5043,9 +5043,8 @@ S: Maintained 
F:	drivers/net/ethernet/marvell/sk*



MARVELL LIBERTAS WIRELESS DRIVER

M:	Dan Williams <dcbw@redhat.com>

L:	libertas-dev@lists.infradead.org

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/libertas/



MARVELL MV643XX ETHERNET DRIVER

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x03F0, 0x311D) },



	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x817a) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3004) },

	{ USB_DEVICE(0x04CA, 0x3005) },
@@ -107,9 +109,11 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); 
static struct usb_device_id ath3k_blist_tbl[] = {



	/* Atheros AR3012 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+2 −0
Original line number Diff line number Diff line
@@ -131,9 +131,11 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },



	/* Atheros 3012 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

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

+4 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
					  AR_PHY_AGC_CONTROL_FLTR_CAL   |

					  AR_PHY_AGC_CONTROL_PKDET_CAL;



	/* Use chip chainmask only for calibration */

	ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);



	if (rtt) {
@@ -1151,6 +1152,9 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
		ar9003_hw_rtt_disable(ah);

	}



	/* Revert chainmask to runtime parameters */

	ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);



	/* Initialize list pointers */

	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;

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

+15 −14
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ void ath_tx_complete_poll_work(struct work_struct *work) 
	int i;

	bool needreset = false;



	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)

		if (ATH_TXQ_SETUP(sc, i)) {

			txq = &sc->tx.txq[i];

	for (i = 0; i < IEEE80211_NUM_ACS; i++) {

		txq = sc->tx.txq_map[i];



		ath_txq_lock(sc, txq);

		if (txq->axq_depth) {

			if (txq->axq_tx_inprogress) {
@@ -170,6 +170,7 @@ void ath_rx_poll(unsigned long data) 
{

	struct ath_softc *sc = (struct ath_softc *)data;



	if (!test_bit(SC_OP_INVALID, &sc->sc_flags))

		ieee80211_queue_work(sc->hw, &sc->hw_check_work);

}