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

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

Merge tag 'mac80211-for-davem-2017-11-20' of... 

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



Johannes Berg says:

====================
A few things:
 * straggler timer conversions from Kees
 * memory leak fix in hwsim
 * fix some fallout from regdb changes if wireless is built-in
 * also free aggregation sessions in startup state when station
   goes away, to avoid crashing the timer
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b48b1f7a 33ddd81e

drivers/net/wireless/mac80211_hwsim.c

+4 −1
Original line number Diff line number Diff line
@@ -3108,6 +3108,7 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
{

	struct hwsim_new_radio_params param = { 0 };

	const char *hwname = NULL;

	int ret;



	param.reg_strict = info->attrs[HWSIM_ATTR_REG_STRICT_REG];

	param.p2p_device = info->attrs[HWSIM_ATTR_SUPPORT_P2P_DEVICE];
@@ -3147,7 +3148,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
		param.regd = hwsim_world_regdom_custom[idx];

	}



	return mac80211_hwsim_new_radio(info, &param);

	ret = mac80211_hwsim_new_radio(info, &param);

	kfree(hwname);

	return ret;

}



static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)

net/mac80211/agg-rx.c

+17 −24
Original line number Diff line number Diff line
@@ -151,21 +151,17 @@ EXPORT_SYMBOL(ieee80211_stop_rx_ba_session); 
 * After accepting the AddBA Request we activated a timer,

 * resetting it after each frame that arrives from the originator.

 */

static void sta_rx_agg_session_timer_expired(unsigned long data)

static void sta_rx_agg_session_timer_expired(struct timer_list *t)

{

	/* not an elegant detour, but there is no choice as the timer passes

	 * only one argument, and various sta_info are needed here, so init

	 * flow in sta_info_create gives the TID as data, while the timer_to_id

	 * array gives the sta through container_of */

	u8 *ptid = (u8 *)data;

	u8 *timer_to_id = ptid - *ptid;

	struct sta_info *sta = container_of(timer_to_id, struct sta_info,

					 timer_to_tid[0]);

	struct tid_ampdu_rx *tid_rx_timer =

		from_timer(tid_rx_timer, t, session_timer);

	struct sta_info *sta = tid_rx_timer->sta;

	u8 tid = tid_rx_timer->tid;

	struct tid_ampdu_rx *tid_rx;

	unsigned long timeout;



	rcu_read_lock();

	tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[*ptid]);

	tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);

	if (!tid_rx) {

		rcu_read_unlock();

		return;
@@ -180,21 +176,18 @@ static void sta_rx_agg_session_timer_expired(unsigned long data) 
	rcu_read_unlock();



	ht_dbg(sta->sdata, "RX session timer expired on %pM tid %d\n",

	       sta->sta.addr, (u16)*ptid);

	       sta->sta.addr, tid);



	set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);

	set_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired);

	ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);

}



static void sta_rx_agg_reorder_timer_expired(unsigned long data)

static void sta_rx_agg_reorder_timer_expired(struct timer_list *t)

{

	u8 *ptid = (u8 *)data;

	u8 *timer_to_id = ptid - *ptid;

	struct sta_info *sta = container_of(timer_to_id, struct sta_info,

			timer_to_tid[0]);

	struct tid_ampdu_rx *tid_rx = from_timer(tid_rx, t, reorder_timer);



	rcu_read_lock();

	ieee80211_release_reorder_timeout(sta, *ptid);

	ieee80211_release_reorder_timeout(tid_rx->sta, tid_rx->tid);

	rcu_read_unlock();

}
@@ -356,14 +349,12 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, 
	spin_lock_init(&tid_agg_rx->reorder_lock);



	/* rx timer */

	setup_deferrable_timer(&tid_agg_rx->session_timer,

			       sta_rx_agg_session_timer_expired,

			       (unsigned long)&sta->timer_to_tid[tid]);

	timer_setup(&tid_agg_rx->session_timer,

		    sta_rx_agg_session_timer_expired, TIMER_DEFERRABLE);



	/* rx reorder timer */

	setup_timer(&tid_agg_rx->reorder_timer,

		    sta_rx_agg_reorder_timer_expired,

		    (unsigned long)&sta->timer_to_tid[tid]);

	timer_setup(&tid_agg_rx->reorder_timer,

		    sta_rx_agg_reorder_timer_expired, 0);



	/* prepare reordering buffer */

	tid_agg_rx->reorder_buf =
@@ -399,6 +390,8 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, 
	tid_agg_rx->auto_seq = auto_seq;

	tid_agg_rx->started = false;

	tid_agg_rx->reorder_buf_filtered = 0;

	tid_agg_rx->tid = tid;

	tid_agg_rx->sta = sta;

	status = WLAN_STATUS_SUCCESS;



	/* activate it for RX */

net/mac80211/agg-tx.c

+23 −26
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 


	spin_lock_bh(&sta->lock);



	/* free struct pending for start, if present */

	tid_tx = sta->ampdu_mlme.tid_start_tx[tid];

	kfree(tid_tx);

	sta->ampdu_mlme.tid_start_tx[tid] = NULL;



	tid_tx = rcu_dereference_protected_tid_tx(sta, tid);

	if (!tid_tx) {

		spin_unlock_bh(&sta->lock);
@@ -422,15 +427,12 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 
 * add Block Ack response will arrive from the recipient.

 * If this timer expires sta_addba_resp_timer_expired will be executed.

 */

static void sta_addba_resp_timer_expired(unsigned long data)

static void sta_addba_resp_timer_expired(struct timer_list *t)

{

	/* not an elegant detour, but there is no choice as the timer passes

	 * only one argument, and both sta_info and TID are needed, so init

	 * flow in sta_info_create gives the TID as data, while the timer_to_id

	 * array gives the sta through container_of */

	u16 tid = *(u8 *)data;

	struct sta_info *sta = container_of((void *)data,

		struct sta_info, timer_to_tid[tid]);

	struct tid_ampdu_tx *tid_tx_timer =

		from_timer(tid_tx_timer, t, addba_resp_timer);

	struct sta_info *sta = tid_tx_timer->sta;

	u8 tid = tid_tx_timer->tid;

	struct tid_ampdu_tx *tid_tx;



	/* check if the TID waits for addBA response */
@@ -525,21 +527,17 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
 * After accepting the AddBA Response we activated a timer,

 * resetting it after each frame that we send.

 */

static void sta_tx_agg_session_timer_expired(unsigned long data)

static void sta_tx_agg_session_timer_expired(struct timer_list *t)

{

	/* not an elegant detour, but there is no choice as the timer passes

	 * only one argument, and various sta_info are needed here, so init

	 * flow in sta_info_create gives the TID as data, while the timer_to_id

	 * array gives the sta through container_of */

	u8 *ptid = (u8 *)data;

	u8 *timer_to_id = ptid - *ptid;

	struct sta_info *sta = container_of(timer_to_id, struct sta_info,

					 timer_to_tid[0]);

	struct tid_ampdu_tx *tid_tx_timer =

		from_timer(tid_tx_timer, t, session_timer);

	struct sta_info *sta = tid_tx_timer->sta;

	u8 tid = tid_tx_timer->tid;

	struct tid_ampdu_tx *tid_tx;

	unsigned long timeout;



	rcu_read_lock();

	tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[*ptid]);

	tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]);

	if (!tid_tx || test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {

		rcu_read_unlock();

		return;
@@ -555,9 +553,9 @@ static void sta_tx_agg_session_timer_expired(unsigned long data) 
	rcu_read_unlock();



	ht_dbg(sta->sdata, "tx session timer expired on %pM tid %d\n",

	       sta->sta.addr, (u16)*ptid);

	       sta->sta.addr, tid);



	ieee80211_stop_tx_ba_session(&sta->sta, *ptid);

	ieee80211_stop_tx_ba_session(&sta->sta, tid);

}



int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
@@ -670,16 +668,15 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	__set_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);



	tid_tx->timeout = timeout;

	tid_tx->sta = sta;

	tid_tx->tid = tid;



	/* response timer */

	setup_timer(&tid_tx->addba_resp_timer,

		    sta_addba_resp_timer_expired,

		    (unsigned long)&sta->timer_to_tid[tid]);

	timer_setup(&tid_tx->addba_resp_timer, sta_addba_resp_timer_expired, 0);



	/* tx timer */

	setup_deferrable_timer(&tid_tx->session_timer,

			       sta_tx_agg_session_timer_expired,

			       (unsigned long)&sta->timer_to_tid[tid]);

	timer_setup(&tid_tx->session_timer,

		    sta_tx_agg_session_timer_expired, TIMER_DEFERRABLE);



	/* assign a dialog token */

	sta->ampdu_mlme.dialog_token_allocator++;

net/mac80211/ibss.c

+3 −4
Original line number Diff line number Diff line
@@ -1711,10 +1711,10 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) 
	sdata_unlock(sdata);

}



static void ieee80211_ibss_timer(unsigned long data)

static void ieee80211_ibss_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

		from_timer(sdata, t, u.ibss.timer);



	ieee80211_queue_work(&sdata->local->hw, &sdata->work);

}
@@ -1723,8 +1723,7 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) 
{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;



	setup_timer(&ifibss->timer, ieee80211_ibss_timer,

		    (unsigned long) sdata);

	timer_setup(&ifibss->timer, ieee80211_ibss_timer, 0);

	INIT_LIST_HEAD(&ifibss->incomplete_stations);

	spin_lock_init(&ifibss->incomplete_lock);

	INIT_WORK(&ifibss->csa_connection_drop_work,

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ struct tpt_led_trigger { 
	const struct ieee80211_tpt_blink *blink_table;

	unsigned int blink_table_len;

	struct timer_list timer;

	struct ieee80211_local *local;

	unsigned long prev_traffic;

	unsigned long tx_bytes, rx_bytes;

	unsigned int active, want;
@@ -1932,7 +1933,7 @@ static inline int ieee80211_ac_from_tid(int tid) 


void ieee80211_dynamic_ps_enable_work(struct work_struct *work);

void ieee80211_dynamic_ps_disable_work(struct work_struct *work);

void ieee80211_dynamic_ps_timer(unsigned long data);

void ieee80211_dynamic_ps_timer(struct timer_list *t);

void ieee80211_send_nullfunc(struct ieee80211_local *local,

			     struct ieee80211_sub_if_data *sdata,

			     bool powersave);