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

Merge tag 'mac80211-next-for-net-next-2021-06-25' of... 

Merge tag 'mac80211-next-for-net-next-2021-06-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes berg says:

====================
Lots of changes:
 * aggregation handling improvements for some drivers
 * hidden AP discovery on 6 GHz and other HE 6 GHz
   improvements
 * minstrel improvements for no-ack frames
 * deferred rate control for TXQs to improve reaction
   times
 * virtual time-based airtime scheduler
 * along with various little cleanups/fixups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c4512c63 2433647b

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

+1 −1
Original line number Diff line number Diff line
@@ -2654,7 +2654,7 @@ static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw, 


static void ath9k_mgd_prepare_tx(struct ieee80211_hw *hw,

				 struct ieee80211_vif *vif,

				 u16 duration)

				 struct ieee80211_prep_tx_info *info)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

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

+3 −3
Original line number Diff line number Diff line
@@ -3306,14 +3306,14 @@ static int iwl_mvm_mac_conf_tx(struct ieee80211_hw *hw, 


static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,

				       struct ieee80211_vif *vif,

				       u16 req_duration)

				       struct ieee80211_prep_tx_info *info)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;

	u32 min_duration = IWL_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS;



	if (req_duration > duration)

		duration = req_duration;

	if (info->duration > duration)

		duration = info->duration;



	mutex_lock(&mvm->mutex);

	/* Try really hard to protect the session and hear a beacon

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,9 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
	if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_INVALID_STA))

		return -1;



	if (unlikely(ieee80211_is_any_nullfunc(fc)) && sta->he_cap.has_he)

		return -1;



	if (unlikely(ieee80211_is_probe_resp(fc)))

		iwl_mvm_probe_resp_set_noa(mvm, skb);

drivers/net/wireless/mac80211_hwsim.c

+40 −15
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ struct mac80211_hwsim_data { 
	u32 ciphers[ARRAY_SIZE(hwsim_ciphers)];



	struct mac_address addresses[2];

	struct ieee80211_chanctx_conf *chanctx;

	int channels, idx;

	bool use_chanctx;

	bool destroy_on_close;
@@ -1257,7 +1258,8 @@ static inline u16 trans_tx_rate_flags_ieee2hwsim(struct ieee80211_tx_rate *rate) 


static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,

				       struct sk_buff *my_skb,

				       int dst_portid)

				       int dst_portid,

				       struct ieee80211_channel *channel)

{

	struct sk_buff *skb;

	struct mac80211_hwsim_data *data = hw->priv;
@@ -1312,7 +1314,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
	if (nla_put_u32(skb, HWSIM_ATTR_FLAGS, hwsim_flags))

		goto nla_put_failure;



	if (nla_put_u32(skb, HWSIM_ATTR_FREQ, data->channel->center_freq))

	if (nla_put_u32(skb, HWSIM_ATTR_FREQ, channel->center_freq))

		goto nla_put_failure;



	/* We get the tx control (rate and retries) info*/
@@ -1659,7 +1661,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, 
	_portid = READ_ONCE(data->wmediumd);



	if (_portid || hwsim_virtio_enabled)

		return mac80211_hwsim_tx_frame_nl(hw, skb, _portid);

		return mac80211_hwsim_tx_frame_nl(hw, skb, _portid, channel);



	/* NO wmediumd detected, perfect medium simulation */

	data->tx_pkts++;
@@ -1775,8 +1777,10 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, 
	mac80211_hwsim_monitor_rx(hw, skb, chan);



	if (_pid || hwsim_virtio_enabled)

		return mac80211_hwsim_tx_frame_nl(hw, skb, _pid);

		return mac80211_hwsim_tx_frame_nl(hw, skb, _pid, chan);



	data->tx_pkts++;

	data->tx_bytes += skb->len;

	mac80211_hwsim_tx_frame_no_nl(hw, skb, chan);

	dev_kfree_skb(skb);

}
@@ -2514,6 +2518,11 @@ static int mac80211_hwsim_croc(struct ieee80211_hw *hw, 
static int mac80211_hwsim_add_chanctx(struct ieee80211_hw *hw,

				      struct ieee80211_chanctx_conf *ctx)

{

	struct mac80211_hwsim_data *hwsim = hw->priv;



	mutex_lock(&hwsim->mutex);

	hwsim->chanctx = ctx;

	mutex_unlock(&hwsim->mutex);

	hwsim_set_chanctx_magic(ctx);

	wiphy_dbg(hw->wiphy,

		  "add channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",
@@ -2525,6 +2534,11 @@ static int mac80211_hwsim_add_chanctx(struct ieee80211_hw *hw, 
static void mac80211_hwsim_remove_chanctx(struct ieee80211_hw *hw,

					  struct ieee80211_chanctx_conf *ctx)

{

	struct mac80211_hwsim_data *hwsim = hw->priv;



	mutex_lock(&hwsim->mutex);

	hwsim->chanctx = NULL;

	mutex_unlock(&hwsim->mutex);

	wiphy_dbg(hw->wiphy,

		  "remove channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",

		  ctx->def.chan->center_freq, ctx->def.width,
@@ -2537,6 +2551,11 @@ static void mac80211_hwsim_change_chanctx(struct ieee80211_hw *hw, 
					  struct ieee80211_chanctx_conf *ctx,

					  u32 changed)

{

	struct mac80211_hwsim_data *hwsim = hw->priv;



	mutex_lock(&hwsim->mutex);

	hwsim->chanctx = ctx;

	mutex_unlock(&hwsim->mutex);

	hwsim_check_chanctx_magic(ctx);

	wiphy_dbg(hw->wiphy,

		  "change channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",
@@ -3129,6 +3148,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
		hw->wiphy->max_remain_on_channel_duration = 1000;

		data->if_combination.radar_detect_widths = 0;

		data->if_combination.num_different_channels = data->channels;

		data->chanctx = NULL;

	} else {

		data->if_combination.num_different_channels = 1;

		data->if_combination.radar_detect_widths =
@@ -3638,6 +3658,7 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 
	int frame_data_len;

	void *frame_data;

	struct sk_buff *skb = NULL;

	struct ieee80211_channel *channel = NULL;



	if (!info->attrs[HWSIM_ATTR_ADDR_RECEIVER] ||

	    !info->attrs[HWSIM_ATTR_FRAME] ||
@@ -3664,6 +3685,17 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 
	if (!data2)

		goto out;



	if (data2->use_chanctx) {

		if (data2->tmp_chan)

			channel = data2->tmp_chan;

		else if (data2->chanctx)

			channel = data2->chanctx->def.chan;

	} else {

		channel = data2->channel;

	}

	if (!channel)

		goto out;



	if (!hwsim_virtio_enabled) {

		if (hwsim_net_get_netgroup(genl_info_net(info)) !=

		    data2->netgroup)
@@ -3675,7 +3707,7 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 


	/* check if radio is configured properly */



	if (data2->idle || !data2->started)

	if ((data2->idle && !data2->tmp_chan) || !data2->started)

		goto out;



	/* A frame is received from user space */
@@ -3688,18 +3720,16 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 
		mutex_lock(&data2->mutex);

		rx_status.freq = nla_get_u32(info->attrs[HWSIM_ATTR_FREQ]);



		if (rx_status.freq != data2->channel->center_freq &&

		    (!data2->tmp_chan ||

		     rx_status.freq != data2->tmp_chan->center_freq)) {

		if (rx_status.freq != channel->center_freq) {

			mutex_unlock(&data2->mutex);

			goto out;

		}

		mutex_unlock(&data2->mutex);

	} else {

		rx_status.freq = data2->channel->center_freq;

		rx_status.freq = channel->center_freq;

	}



	rx_status.band = data2->channel->band;

	rx_status.band = channel->band;

	rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]);

	rx_status.signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
@@ -3796,11 +3826,6 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
		return -EINVAL;

	}



	if (param.channels > CFG80211_MAX_NUM_DIFFERENT_CHANNELS) {

		GENL_SET_ERR_MSG(info, "too many channels specified");

		return -EINVAL;

	}



	if (info->attrs[HWSIM_ATTR_NO_VIF])

		param.no_vif = true;

drivers/net/wireless/realtek/rtw88/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static void rtw_ops_sw_scan_complete(struct ieee80211_hw *hw, 


static void rtw_ops_mgd_prepare_tx(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   u16 duration)

				   struct ieee80211_prep_tx_info *info)

{

	struct rtw_dev *rtwdev = hw->priv;