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

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

Merge tag 'mac80211-for-davem-2017-09-07' of... 

Merge tag 'mac80211-for-davem-2017-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Back from a long absence, so we have a number of things:
 * a remain-on-channel fix from Avi
 * hwsim TX power fix from Beni
 * null-PTR dereference with iTXQ in some rare configurations (Chunho)
 * 40 MHz custom regdomain fixes (Emmanuel)
 * look at right place in HT/VHT capability parsing (Igor)
 * complete A-MPDU teardown properly (Ilan)
 * Mesh ID Element ordering fix (Liad)
 * avoid tracing warning in ht_dbg() (Sharon)
 * fix print of assoc/reassoc (Simon)
 * fix encrypted VLAN with iTXQ (myself)
 * fix calling context of TX queue wake (myself)
 * fix a deadlock with ath10k aggregation (myself)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e0deed9 bde59c47

drivers/net/wireless/mac80211_hwsim.c

+0 −2
Original line number Diff line number Diff line
@@ -1362,8 +1362,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, 
				       txi->control.rates,

				       ARRAY_SIZE(txi->control.rates));



	txi->rate_driver_data[0] = channel;



	if (skb->len >= 24 + 8 &&

	    ieee80211_is_probe_resp(hdr->frame_control)) {

		/* fake header transmission time */

include/net/mac80211.h

+2 −13
Original line number Diff line number Diff line
@@ -918,22 +918,11 @@ struct ieee80211_tx_info { 
				/* only needed before rate control */

				unsigned long jiffies;

			};

			/* NB: vif can be NULL for injected frames */

			union {

			/* NB: vif can be NULL for injected frames */

			struct ieee80211_vif *vif;



				/* When packets are enqueued on txq it's easy

				 * to re-construct the vif pointer. There's no

				 * more space in tx_info so it can be used to

				 * store the necessary enqueue time for packet

				 * sojourn time computation.

				 */

				codel_time_t enqueue_time;

			};

			struct ieee80211_key_conf *hw_key;

			u32 flags;

			/* 4 bytes free */

			codel_time_t enqueue_time;

		} control;

		struct {

			u64 cookie;

net/mac80211/agg-rx.c

+21 −11
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d 
	ieee80211_tx_skb(sdata, skb);

}



void __ieee80211_start_rx_ba_session(struct sta_info *sta,

void ___ieee80211_start_rx_ba_session(struct sta_info *sta,

				      u8 dialog_token, u16 timeout,

				      u16 start_seq_num, u16 ba_policy, u16 tid,

				      u16 buf_size, bool tx, bool auto_seq)
@@ -267,7 +267,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
		ht_dbg(sta->sdata,

		       "STA %pM requests BA session on unsupported tid %d\n",

		       sta->sta.addr, tid);

		goto end_no_lock;

		goto end;

	}



	if (!sta->sta.ht_cap.ht_supported) {
@@ -275,14 +275,14 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
		       "STA %pM erroneously requests BA session on tid %d w/o QoS\n",

		       sta->sta.addr, tid);

		/* send a response anyway, it's an error case if we get here */

		goto end_no_lock;

		goto end;

	}



	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

		ht_dbg(sta->sdata,

		       "Suspend in progress - Denying ADDBA request (%pM tid %d)\n",

		       sta->sta.addr, tid);

		goto end_no_lock;

		goto end;

	}



	/* sanity check for incoming parameters:
@@ -296,7 +296,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
		ht_dbg_ratelimited(sta->sdata,

				   "AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",

				   sta->sta.addr, tid, ba_policy, buf_size);

		goto end_no_lock;

		goto end;

	}

	/* determine default buffer size */

	if (buf_size == 0)
@@ -311,7 +311,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
	       buf_size, sta->sta.addr);



	/* examine state machine */

	mutex_lock(&sta->ampdu_mlme.mtx);

	lockdep_assert_held(&sta->ampdu_mlme.mtx);



	if (test_bit(tid, sta->ampdu_mlme.agg_session_valid)) {

		if (sta->ampdu_mlme.tid_rx_token[tid] == dialog_token) {
@@ -415,15 +415,25 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, 
		__clear_bit(tid, sta->ampdu_mlme.unexpected_agg);

		sta->ampdu_mlme.tid_rx_token[tid] = dialog_token;

	}

	mutex_unlock(&sta->ampdu_mlme.mtx);



end_no_lock:

	if (tx)

		ieee80211_send_addba_resp(sta->sdata, sta->sta.addr, tid,

					  dialog_token, status, 1, buf_size,

					  timeout);

}



void __ieee80211_start_rx_ba_session(struct sta_info *sta,

				     u8 dialog_token, u16 timeout,

				     u16 start_seq_num, u16 ba_policy, u16 tid,

				     u16 buf_size, bool tx, bool auto_seq)

{

	mutex_lock(&sta->ampdu_mlme.mtx);

	___ieee80211_start_rx_ba_session(sta, dialog_token, timeout,

					 start_seq_num, ba_policy, tid,

					 buf_size, tx, auto_seq);

	mutex_unlock(&sta->ampdu_mlme.mtx);

}



void ieee80211_process_addba_request(struct ieee80211_local *local,

				     struct sta_info *sta,

				     struct ieee80211_mgmt *mgmt,

net/mac80211/agg-tx.c

+6 −2
Original line number Diff line number Diff line
@@ -226,7 +226,11 @@ ieee80211_agg_start_txq(struct sta_info *sta, int tid, bool enable) 
		clear_bit(IEEE80211_TXQ_AMPDU, &txqi->flags);



	clear_bit(IEEE80211_TXQ_STOP, &txqi->flags);

	local_bh_disable();

	rcu_read_lock();

	drv_wake_tx_queue(sta->sdata->local, txqi);

	rcu_read_unlock();

	local_bh_enable();

}



/*
@@ -436,7 +440,7 @@ static void sta_addba_resp_timer_expired(unsigned long data) 
	    test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {

		rcu_read_unlock();

		ht_dbg(sta->sdata,

		       "timer expired on %pM tid %d but we are not (or no longer) expecting addBA response there\n",

		       "timer expired on %pM tid %d not expecting addBA response\n",

		       sta->sta.addr, tid);

		return;

	}
@@ -639,7 +643,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	    time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +

			HT_AGG_RETRIES_PERIOD)) {

		ht_dbg(sdata,

		       "BA request denied - waiting a grace period after %d failed requests on %pM tid %u\n",

		       "BA request denied - %d failed requests on %pM tid %u\n",

		       sta->ampdu_mlme.addba_req_num[tid], sta->sta.addr, tid);

		ret = -EBUSY;

		goto err_unlock_sta;

net/mac80211/ht.c

+21 −3
Original line number Diff line number Diff line
@@ -300,6 +300,24 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, 


	/* stopping might queue the work again - so cancel only afterwards */

	cancel_work_sync(&sta->ampdu_mlme.work);



	/*

	 * In case the tear down is part of a reconfigure due to HW restart

	 * request, it is possible that the low level driver requested to stop

	 * the BA session, so handle it to properly clean tid_tx data.

	 */

	mutex_lock(&sta->ampdu_mlme.mtx);

	for (i = 0; i < IEEE80211_NUM_TIDS; i++) {

		struct tid_ampdu_tx *tid_tx =

			rcu_dereference_protected_tid_tx(sta, i);



		if (!tid_tx)

			continue;



		if (test_and_clear_bit(HT_AGG_STATE_STOP_CB, &tid_tx->state))

			ieee80211_stop_tx_ba_cb(sta, i, tid_tx);

	}

	mutex_unlock(&sta->ampdu_mlme.mtx);

}



void ieee80211_ba_session_work(struct work_struct *work)
@@ -333,7 +351,7 @@ void ieee80211_ba_session_work(struct work_struct *work) 


		if (test_and_clear_bit(tid,

				       sta->ampdu_mlme.tid_rx_manage_offl))

			__ieee80211_start_rx_ba_session(sta, 0, 0, 0, 1, tid,

			___ieee80211_start_rx_ba_session(sta, 0, 0, 0, 1, tid,

							 IEEE80211_MAX_AMPDU_BUF,

							 false, true);