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

Merge tag 'master-2014-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-07-24

Please pull this batch of fixes intended for the 3.16 stream...

For the mac80211 fixes, Johannes says:

"I have two fixes: one for tracing that fixes a long-standing NULL
pointer dereference, and one for a mac80211 issue that causes iwlmvm to
send invalid frames during authentication/association."

and,

"One more fix - for a bug in the newly introduced code that obtains rate
control information for stations."

For the iwlwifi fixes, Emmanuel says:

"It includes a merge damage fix. This region has been changed in -next
and -fixes quite a few times and apparently, I failed to handle it
properly, so here the fix.  Along with that I have a fix from Eliad
to properly handle overlapping BSS in AP mode."

On top of that, Felix provides and ath9k fix for Tx stalls that happen
after an aggregation session failure.

Please let me know if there are problems!  There are some changes
here that will cause merge conflicts in -next.  Once you merge this
I can pull it into wireless-next and resolve those issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a88a7be6 c01fac1c

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

+9 −0
Original line number Diff line number Diff line
@@ -887,6 +887,15 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq, 


		tx_info = IEEE80211_SKB_CB(skb);

		tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT;



		/*

		 * No aggregation session is running, but there may be frames

		 * from a previous session or a failed attempt in the queue.

		 * Send them out as normal data frames

		 */

		if (!tid->active)

			tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;



		if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {

			bf->bf_state.bf_type = 0;

			return bf;

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+13 −2
Original line number Diff line number Diff line
@@ -1072,8 +1072,12 @@ static int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm, 
	/* Fill the common data for all mac context types */

	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);



	/* Also enable probe requests to pass */

	cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);

	/*

	 * pass probe requests and beacons from other APs (needed

	 * for ht protection)

	 */

	cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST |

					MAC_FILTER_IN_BEACON);



	/* Fill the data specific for ap mode */

	iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.ap,
@@ -1094,6 +1098,13 @@ static int iwl_mvm_mac_ctxt_cmd_go(struct iwl_mvm *mvm, 
	/* Fill the common data for all mac context types */

	iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);



	/*

	 * pass probe requests and beacons from other APs (needed

	 * for ht protection)

	 */

	cmd.filter_flags |= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST |

					MAC_FILTER_IN_BEACON);



	/* Fill the data specific for GO mode */

	iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap,

				     action == FW_CTXT_ACTION_ADD);

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+0 −7
Original line number Diff line number Diff line
@@ -303,13 +303,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_UAPSD_AC_INFO;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	hw->sta_data_size = sizeof(struct iwl_mvm_sta);

	hw->vif_data_size = sizeof(struct iwl_mvm_vif);

	hw->chanctx_data_size = sizeof(u16);

net/mac80211/cfg.c

+4 −1
Original line number Diff line number Diff line
@@ -472,12 +472,15 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
{

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_local *local = sdata->local;

	struct rate_control_ref *ref = local->rate_ctrl;

	struct rate_control_ref *ref = NULL;

	struct timespec uptime;

	u64 packets = 0;

	u32 thr = 0;

	int i, ac;



	if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))

		ref = local->rate_ctrl;



	sinfo->generation = sdata->local->sta_generation;



	sinfo->filled = STATION_INFO_INACTIVE_TIME |

net/mac80211/tx.c

+10 −10
Original line number Diff line number Diff line
@@ -414,6 +414,9 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx) 
	if (ieee80211_has_order(hdr->frame_control))

		return TX_CONTINUE;



	if (ieee80211_is_probe_req(hdr->frame_control))

		return TX_CONTINUE;



	if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)

		info->hw_queue = tx->sdata->vif.cab_queue;
@@ -463,6 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
{

	struct sta_info *sta = tx->sta;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;

	struct ieee80211_local *local = tx->local;



	if (unlikely(!sta))
@@ -473,6 +477,12 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
		     !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {

		int ac = skb_get_queue_mapping(tx->skb);



		if (ieee80211_is_mgmt(hdr->frame_control) &&

		    !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {

			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;

			return TX_CONTINUE;

		}



		ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",

		       sta->sta.addr, sta->sta.aid, ac);

		if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
@@ -531,19 +541,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) 
static ieee80211_tx_result debug_noinline

ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;



	if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))

		return TX_CONTINUE;



	if (ieee80211_is_mgmt(hdr->frame_control) &&

	    !ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {

		if (tx->flags & IEEE80211_TX_UNICAST)

			info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;

		return TX_CONTINUE;

	}



	if (tx->flags & IEEE80211_TX_UNICAST)

		return ieee80211_tx_h_unicast_ps_buf(tx);

	else

CRA Git | Maintained and supported by SUSTech CRA and CCSE