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

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

Merge tag 'wireless-drivers-for-davem-2015-10-01' of... 

Merge tag 'wireless-drivers-for-davem-2015-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
pull-request: wireless-drivers 2015-10-01

ath9k:

* declare required extra tx headroom

ath10k:

* fix DMA related firmware crashes on multiple devices

rt2800usb:

* add usb ID 1b75:3070 for Airlive WT-2000USB

b43:

* probe bcma core (device) rev 0x15
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 181a4224 76d164f5

drivers/net/wireless/ath/ath10k/hw.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -337,7 +337,7 @@ enum ath10k_hw_rate_cck { 
#define TARGET_10X_MAX_FRAG_ENTRIES		0

#define TARGET_10X_MAX_FRAG_ENTRIES		0





/* 10.2 parameters */

/* 10.2 parameters */

#define TARGET_10_2_DMA_BURST_SIZE		1

#define TARGET_10_2_DMA_BURST_SIZE		0





/* Target specific defines for WMI-TLV firmware */

/* Target specific defines for WMI-TLV firmware */

#define TARGET_TLV_NUM_VDEVS			4

#define TARGET_TLV_NUM_VDEVS			4
@@ -391,7 +391,7 @@ enum ath10k_hw_rate_cck { 




#define TARGET_10_4_TX_DBG_LOG_SIZE		1024

#define TARGET_10_4_TX_DBG_LOG_SIZE		1024

#define TARGET_10_4_NUM_WDS_ENTRIES		32

#define TARGET_10_4_NUM_WDS_ENTRIES		32

#define TARGET_10_4_DMA_BURST_SIZE		1

#define TARGET_10_4_DMA_BURST_SIZE		0

#define TARGET_10_4_MAC_AGGR_DELIM		0

#define TARGET_10_4_MAC_AGGR_DELIM		0

#define TARGET_10_4_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1

#define TARGET_10_4_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1

#define TARGET_10_4_VOW_CONFIG			0

#define TARGET_10_4_VOW_CONFIG			0

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -880,6 +880,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
	hw->max_rate_tries = 10;

	hw->max_rate_tries = 10;

	hw->sta_data_size = sizeof(struct ath_node);

	hw->sta_data_size = sizeof(struct ath_node);

	hw->vif_data_size = sizeof(struct ath_vif);

	hw->vif_data_size = sizeof(struct ath_vif);

	hw->extra_tx_headroom = 4;





	hw->wiphy->available_antennas_rx = BIT(ah->caps.max_rxchains) - 1;

	hw->wiphy->available_antennas_rx = BIT(ah->caps.max_rxchains) - 1;

	hw->wiphy->available_antennas_tx = BIT(ah->caps.max_txchains) - 1;

	hw->wiphy->available_antennas_tx = BIT(ah->caps.max_txchains) - 1;

drivers/net/wireless/b43/main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ MODULE_PARM_DESC(allhwsupport, "Enable support for all hardware (even it if over 
#ifdef CONFIG_B43_BCMA

#ifdef CONFIG_B43_BCMA

static const struct bcma_device_id b43_bcma_tbl[] = {

static const struct bcma_device_id b43_bcma_tbl[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x15, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1C, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1C, BCMA_ANY_CLASS),

drivers/net/wireless/rt2x00/rt2800usb.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1114,6 +1114,7 @@ static struct usb_device_id rt2800usb_device_table[] = { 
	{ USB_DEVICE(0x0db0, 0x871c) },

	{ USB_DEVICE(0x0db0, 0x871c) },

	{ USB_DEVICE(0x0db0, 0x899a) },

	{ USB_DEVICE(0x0db0, 0x899a) },

	/* Ovislink */

	/* Ovislink */

	{ USB_DEVICE(0x1b75, 0x3070) },

	{ USB_DEVICE(0x1b75, 0x3071) },

	{ USB_DEVICE(0x1b75, 0x3071) },

	{ USB_DEVICE(0x1b75, 0x3072) },

	{ USB_DEVICE(0x1b75, 0x3072) },

	{ USB_DEVICE(0x1b75, 0xa200) },

	{ USB_DEVICE(0x1b75, 0xa200) },