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

Commit 811477de 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 fa1e492a 4668cce5

drivers/bluetooth/ath3k.c

+10 −0
Original line number Diff line number Diff line
@@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe056) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

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

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

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

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

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

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

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+5 −0
Original line number Diff line number Diff line
@@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

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

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

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

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

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

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

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −3
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ struct ath_rx { 
	u32 *rxlink;

	u32 num_pkts;

	unsigned int rxfilter;

	spinlock_t rxbuflock;

	struct list_head rxbuf;

	struct ath_descdma rxdma;

	struct ath_buf *rx_bufptr;
@@ -328,7 +327,6 @@ struct ath_rx { 


int ath_startrecv(struct ath_softc *sc);

bool ath_stoprecv(struct ath_softc *sc);

void ath_flushrecv(struct ath_softc *sc);

u32 ath_calcrxfilter(struct ath_softc *sc);

int ath_rx_init(struct ath_softc *sc, int nbufs);

void ath_rx_cleanup(struct ath_softc *sc);
@@ -646,7 +644,6 @@ void ath_ant_comb_update(struct ath_softc *sc); 
enum sc_op_flags {

	SC_OP_INVALID,

	SC_OP_BEACONS,

	SC_OP_RXFLUSH,

	SC_OP_ANI_RUN,

	SC_OP_PRIM_STA_VIF,

	SC_OP_HW_RESET,

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

+1 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, 
				 skb->len, DMA_TO_DEVICE);

		dev_kfree_skb_any(skb);

		bf->bf_buf_addr = 0;

		bf->bf_mpdu = NULL;

	}



	skb = ieee80211_beacon_get(hw, vif);
@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data) 
		return;



	bf = ath9k_beacon_generate(sc->hw, vif);

	WARN_ON(!bf);



	if (sc->beacon.bmisscnt != 0) {

		ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",

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

+0 −1
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, 
	RXS_ERR("RX-LENGTH-ERR", rx_len_err);

	RXS_ERR("RX-OOM-ERR", rx_oom_err);

	RXS_ERR("RX-RATE-ERR", rx_rate_err);

	RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);

	RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);



	PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);