Commit 0ea90f36 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Johannes Berg says:

====================
Some fixes, stack only for now:
 * iTXQ conversion fixes, various bugs reported
 * properly reset multiple BSSID settings
 * fix for a link_sta crash
 * fix for AP VLAN checks
 * fix for MLO address translation

* tag 'wireless-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211: fix MLO + AP_VLAN check
  mac80211: Fix MLO address translation for multiple bss case
  wifi: mac80211: reset multiple BSSID options in stop_ap()
  wifi: mac80211: Fix iTXQ AMPDU fragmentation handling
  wifi: mac80211: sdata can be NULL during AMPDU start
  wifi: mac80211: Proper mark iTXQs for resumption
  wifi: mac80211: fix initialization of rx->link and rx->link_sta
====================

Link: https://lore.kernel.org/r/20230112111941.82408-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d9fc1511 f216033d

include/net/mac80211.h

+0 −4
Original line number Diff line number Diff line
@@ -1832,8 +1832,6 @@ struct ieee80211_vif_cfg { 
 * @drv_priv: data area for driver use, will always be aligned to

 *	sizeof(void \*).

 * @txq: the multicast data TX queue

 * @txqs_stopped: per AC flag to indicate that intermediate TXQs are stopped,

 *	protected by fq->lock.

 * @offload_flags: 802.3 -> 802.11 enapsulation offload flags, see

 *	&enum ieee80211_offload_flags.

 * @mbssid_tx_vif: Pointer to the transmitting interface if MBSSID is enabled.
@@ -1863,8 +1861,6 @@ struct ieee80211_vif { 
	bool probe_req_reg;

	bool rx_mcast_action_reg;



	bool txqs_stopped[IEEE80211_NUM_ACS];



	struct ieee80211_vif *mbssid_tx_vif;



	/* must be last */

net/mac80211/agg-tx.c

+5 −3
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
{

	struct tid_ampdu_tx *tid_tx;

	struct ieee80211_local *local = sta->local;

	struct ieee80211_sub_if_data *sdata = sta->sdata;

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_ampdu_params params = {

		.sta = &sta->sta,

		.action = IEEE80211_AMPDU_TX_START,
@@ -511,8 +511,6 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
	 */

	clear_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);



	ieee80211_agg_stop_txq(sta, tid);



	/*

	 * Make sure no packets are being processed. This ensures that

	 * we have a valid starting sequence number and that in-flight
@@ -521,6 +519,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
	 */

	synchronize_net();



	sdata = sta->sdata;

	params.ssn = sta->tid_seq[tid] >> 4;

	ret = drv_ampdu_action(local, sdata, &params);

	tid_tx->ssn = params.ssn;
@@ -534,6 +533,9 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
		 */

		set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state);

	} else if (ret) {

		if (!sdata)

			return;



		ht_dbg(sdata,

		       "BA request denied - HW unavailable for %pM tid %d\n",

		       sta->sta.addr, tid);

net/mac80211/cfg.c

+7 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int ieee80211_set_ap_mbssid_options(struct ieee80211_sub_if_data *sdata, 
	link_conf->bssid_index = 0;

	link_conf->nontransmitted = false;

	link_conf->ema_ap = false;

	link_conf->bssid_indicator = 0;



	if (sdata->vif.type != NL80211_IFTYPE_AP || !params.tx_wdev)

		return -EINVAL;
@@ -1511,6 +1512,12 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, 
	kfree(link_conf->ftmr_params);

	link_conf->ftmr_params = NULL;



	sdata->vif.mbssid_tx_vif = NULL;

	link_conf->bssid_index = 0;

	link_conf->nontransmitted = false;

	link_conf->ema_ap = false;

	link_conf->bssid_indicator = 0;



	__sta_info_flush(sdata, true);

	ieee80211_free_keys(sdata, true);

net/mac80211/debugfs_sta.c

+3 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf, 
			continue;

		txqi = to_txq_info(sta->sta.txq[i]);

		p += scnprintf(p, bufsz + buf - p,

			       "%d %d %u %u %u %u %u %u %u %u %u 0x%lx(%s%s%s)\n",

			       "%d %d %u %u %u %u %u %u %u %u %u 0x%lx(%s%s%s%s)\n",

			       txqi->txq.tid,

			       txqi->txq.ac,

			       txqi->tin.backlog_bytes,
@@ -182,7 +182,8 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf, 
			       txqi->flags,

			       test_bit(IEEE80211_TXQ_STOP, &txqi->flags) ? "STOP" : "RUN",

			       test_bit(IEEE80211_TXQ_AMPDU, &txqi->flags) ? " AMPDU" : "",

			       test_bit(IEEE80211_TXQ_NO_AMSDU, &txqi->flags) ? " NO-AMSDU" : "");

			       test_bit(IEEE80211_TXQ_NO_AMSDU, &txqi->flags) ? " NO-AMSDU" : "",

			       test_bit(IEEE80211_TXQ_DIRTY, &txqi->flags) ? " DIRTY" : "");

	}



	rcu_read_unlock();

net/mac80211/driver-ops.c

+3 −0
Original line number Diff line number Diff line
@@ -392,6 +392,9 @@ int drv_ampdu_action(struct ieee80211_local *local, 


	might_sleep();



	if (!sdata)

		return -EIO;



	sdata = get_bss_sdata(sdata);

	if (!check_sdata_in_driver(sdata))

		return -EIO;