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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
Please pull this batch of fixes intende for the 3.14 stream...

For the mac80211 bits, Johannes says:

"Here I have a fix from Eliad for the minimal channel width calculation
in the mac80211 code which lead to monitor mode not working at all for
drivers using that. One of my fixes is for an issue noticed by Michal,
we clear an already cleared value but do it without locking, so just
remove that. The other is for a data leak - we leak two bytes of kernel
memory out over the air in QoS NULL frames because those don't get a
sequence number assigned in the TX path."

For the iwlwifi bits, Emmanuel says:

"One more fix and an update for device IDs.
There is a bugzilla reported for the fix which is mentioned in the commit message."

Along with those...

Amitkumar Karwar provides two mwifiex fixes, both correcting some
data transcription problems.

Ivaylo Dimitrov uses skb_trim in the wl1251 driver to avoid
HAVE_EFFICIENT_UNALIGNED_ACCESS problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a8d9bc2e 97bd5f00

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+5 −2
Original line number Diff line number Diff line
@@ -872,8 +872,11 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	lockdep_assert_held(&mvm->mutex);



	/* Rssi update while not associated ?! */

	if (WARN_ON_ONCE(mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT))

	/*

	 * Rssi update while not associated - can happen since the statistics

	 * are handled asynchronously

	 */

	if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)

		return;



	/* No BT - reports should be disabled */

drivers/net/wireless/iwlwifi/pcie/drv.c

+2 −3
Original line number Diff line number Diff line
@@ -359,13 +359,12 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
/* 7265 Series */

	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5112, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x510A, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},

drivers/net/wireless/mwifiex/11ac.c

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv, 
		vht_cap->header.len  =

				cpu_to_le16(sizeof(struct ieee80211_vht_cap));

		memcpy((u8 *)vht_cap + sizeof(struct mwifiex_ie_types_header),

		       (u8 *)bss_desc->bcn_vht_cap +

		       sizeof(struct ieee_types_header),

		       (u8 *)bss_desc->bcn_vht_cap,

		       le16_to_cpu(vht_cap->header.len));



		mwifiex_fill_vht_cap_tlv(priv, vht_cap, bss_desc->bss_band);

drivers/net/wireless/mwifiex/11n.c

+1 −2
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, 
		ht_cap->header.len =

				cpu_to_le16(sizeof(struct ieee80211_ht_cap));

		memcpy((u8 *) ht_cap + sizeof(struct mwifiex_ie_types_header),

		       (u8 *) bss_desc->bcn_ht_cap +

		       sizeof(struct ieee_types_header),

		       (u8 *)bss_desc->bcn_ht_cap,

		       le16_to_cpu(ht_cap->header.len));



		mwifiex_fill_cap_info(priv, radio_type, ht_cap);

drivers/net/wireless/mwifiex/scan.c

+4 −4
Original line number Diff line number Diff line
@@ -2101,11 +2101,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv) 
			 curr_bss->ht_info_offset);



	if (curr_bss->bcn_vht_cap)

		curr_bss->bcn_ht_cap = (void *)(curr_bss->beacon_buf +

		curr_bss->bcn_vht_cap = (void *)(curr_bss->beacon_buf +

						 curr_bss->vht_cap_offset);



	if (curr_bss->bcn_vht_oper)

		curr_bss->bcn_ht_oper = (void *)(curr_bss->beacon_buf +

		curr_bss->bcn_vht_oper = (void *)(curr_bss->beacon_buf +

						  curr_bss->vht_info_offset);



	if (curr_bss->bcn_bss_co_2040)