Commit b9d53190 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 into for-davem
parents da2191e3 36ef0b47

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) {
@@ -1150,6 +1151,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

+13 −13
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) {

drivers/net/wireless/iwlegacy/3945-mac.c

+12 −10
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ il3945_tx_skb(struct il_priv *il, 
	dma_addr_t txcmd_phys;

	int txq_id = skb_get_queue_mapping(skb);

	u16 len, idx, hdr_len;

	u16 firstlen, secondlen;

	u8 id;

	u8 unicast;

	u8 sta_id;
@@ -589,21 +590,22 @@ il3945_tx_skb(struct il_priv *il, 
	len =

	    sizeof(struct il3945_tx_cmd) + sizeof(struct il_cmd_header) +

	    hdr_len;

	len = (len + 3) & ~3;

	firstlen = (len + 3) & ~3;



	/* Physical address of this Tx command's header (not MAC header!),

	 * within command buffer array. */

	txcmd_phys =

	    pci_map_single(il->pci_dev, &out_cmd->hdr, len, PCI_DMA_TODEVICE);

	    pci_map_single(il->pci_dev, &out_cmd->hdr, firstlen,

			   PCI_DMA_TODEVICE);

	if (unlikely(pci_dma_mapping_error(il->pci_dev, txcmd_phys)))

		goto drop_unlock;



	/* Set up TFD's 2nd entry to point directly to remainder of skb,

	 * if any (802.11 null frames have no payload). */

	len = skb->len - hdr_len;

	if (len) {

	secondlen = skb->len - hdr_len;

	if (secondlen > 0) {

		phys_addr =

		    pci_map_single(il->pci_dev, skb->data + hdr_len, len,

		    pci_map_single(il->pci_dev, skb->data + hdr_len, secondlen,

				   PCI_DMA_TODEVICE);

		if (unlikely(pci_dma_mapping_error(il->pci_dev, phys_addr)))

			goto drop_unlock;
@@ -611,12 +613,12 @@ il3945_tx_skb(struct il_priv *il, 


	/* Add buffer containing Tx command and MAC(!) header to TFD's

	 * first entry */

	il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1, 0);

	il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen, 1, 0);

	dma_unmap_addr_set(out_meta, mapping, txcmd_phys);

	dma_unmap_len_set(out_meta, len, len);

	if (len)

		il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, len, 0,

					       U32_PAD(len));

	dma_unmap_len_set(out_meta, len, firstlen);

	if (secondlen > 0)

		il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, secondlen, 0,

					       U32_PAD(secondlen));



	if (!ieee80211_has_morefrags(hdr->frame_control)) {

		txq->need_update = 1;