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

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

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

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



iwlwifi:

* fix ROC removal - avoids a firmware crash
* fix throughput regression on iwldvm devices
* fix panic in BT Coex
* fixes in rate control
* fixes in scan

b43:

* fix support for 5 GHz only BCM43228 model

rtlwifi:

* improve handling of IPv6 packets

brcmfmac:

* perform bound checking on vendor command buffer

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e3d50738 3f161534

drivers/net/wireless/b43/main.c

+1 −0
Original line number Diff line number Diff line
@@ -5370,6 +5370,7 @@ static void b43_supported_bands(struct b43_wldev *dev, bool *have_2ghz_phy, 
	case 0x432a: /* BCM4321 */

	case 0x432d: /* BCM4322 */

	case 0x4352: /* BCM43222 */

	case 0x435a: /* BCM43228 */

	case 0x4333: /* BCM4331 */

	case 0x43a2: /* BCM4360 */

	case 0x43b3: /* BCM4352 */

drivers/net/wireless/brcm80211/brcmfmac/vendor.c

+12 −3
Original line number Diff line number Diff line
@@ -39,13 +39,22 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, 
	void *dcmd_buf = NULL, *wr_pointer;

	u16 msglen, maxmsglen = PAGE_SIZE - 0x100;



	brcmf_dbg(TRACE, "cmd %x set %d len %d\n", cmdhdr->cmd, cmdhdr->set,

		  cmdhdr->len);

	if (len < sizeof(*cmdhdr)) {

		brcmf_err("vendor command too short: %d\n", len);

		return -EINVAL;

	}



	vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);

	ifp = vif->ifp;



	len -= sizeof(struct brcmf_vndr_dcmd_hdr);

	brcmf_dbg(TRACE, "ifidx=%d, cmd=%d\n", ifp->ifidx, cmdhdr->cmd);



	if (cmdhdr->offset > len) {

		brcmf_err("bad buffer offset %d > %d\n", cmdhdr->offset, len);

		return -EINVAL;

	}



	len -= cmdhdr->offset;

	ret_len = cmdhdr->len;

	if (ret_len > 0 || len > 0) {

		if (len > BRCMF_DCMD_MAXLEN) {

drivers/net/wireless/iwlwifi/iwl-1000.c

+4 −2
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -121,7 +122,8 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.base_params = &iwl1000_base_params,			\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

drivers/net/wireless/iwlwifi/iwl-2000.c

+9 −4
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.base_params = &iwl2000_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl2000_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",
@@ -149,7 +151,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -170,7 +173,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.base_params = &iwl2000_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -197,7 +201,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.base_params = &iwl2030_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

drivers/net/wireless/iwlwifi/iwl-5000.c

+4 −2
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -158,7 +159,8 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.base_params = &iwl5000_base_params,			\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",