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

Merge tag 'mac80211-next-for-net-next-2020-02-14' of... 

Merge tag 'mac80211-next-for-net-next-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
A few big new things:
 * 802.11 frame encapsulation offload support
 * more HE (802.11ax) support, including some for 6 GHz band
 * powersave in hwsim, for better testing

Of course as usual there are various cleanups and small fixes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1e5946f5 1f6e0baa

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -5103,7 +5103,8 @@ static int ath10k_mac_txpower_recalc(struct ath10k *ar) 
	lockdep_assert_held(&ar->conf_mutex);



	list_for_each_entry(arvif, &ar->arvifs, list) {

		if (arvif->txpower <= 0)

		/* txpower not initialized yet? */

		if (arvif->txpower == INT_MIN)

			continue;



		if (txpower == -1)

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

+3 −0
Original line number Diff line number Diff line
@@ -1196,6 +1196,9 @@ static void ath9k_tpc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) 
{

	int *power = data;



	if (vif->bss_conf.txpower == INT_MIN)

		return;



	if (*power < vif->bss_conf.txpower)

		*power = vif->bss_conf.txpower;

}

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

+5 −2
Original line number Diff line number Diff line
@@ -2095,10 +2095,13 @@ static void setup_frame_info(struct ieee80211_hw *hw, 


	if (tx_info->control.vif) {

		struct ieee80211_vif *vif = tx_info->control.vif;



		if (vif->bss_conf.txpower == INT_MIN)

			goto nonvifpower;

		txpower = 2 * vif->bss_conf.txpower;

	} else {

		struct ath_softc *sc = hw->priv;

		struct ath_softc *sc;

	nonvifpower:

		sc = hw->priv;



		txpower = sc->cur_chan->cur_txpower;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
	struct iwl_he_sta_context_cmd sta_ctxt_cmd = {

		.sta_id = sta_id,

		.tid_limit = IWL_MAX_TID_COUNT,

		.bss_color = vif->bss_conf.bss_color,

		.bss_color = vif->bss_conf.he_bss_color.color,

		.htc_trig_based_pkt_ext = vif->bss_conf.htc_trig_based_pkt_ext,

		.frame_time_rts_th =

			cpu_to_le16(vif->bss_conf.frame_time_rts_th),

drivers/net/wireless/mac80211_hwsim.c

+9 −2
Original line number Diff line number Diff line
@@ -300,14 +300,12 @@ static struct net_device *hwsim_mon; /* global monitor netdev */ 
	.band = NL80211_BAND_2GHZ, \

	.center_freq = (_freq), \

	.hw_value = (_freq), \

	.max_power = 20, \

}



#define CHAN5G(_freq) { \

	.band = NL80211_BAND_5GHZ, \

	.center_freq = (_freq), \

	.hw_value = (_freq), \

	.max_power = 20, \

}



static const struct ieee80211_channel hwsim_channels_2ghz[] = {
@@ -1595,6 +1593,11 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac, 
	mac80211_hwsim_tx_frame(hw, skb,

				rcu_dereference(vif->chanctx_conf)->def.chan);



	while ((skb = ieee80211_get_buffered_bc(hw, vif)) != NULL) {

		mac80211_hwsim_tx_frame(hw, skb,

				rcu_dereference(vif->chanctx_conf)->def.chan);

	}



	if (vif->csa_active && ieee80211_csa_is_complete(vif))

		ieee80211_csa_finish(vif);

}
@@ -2925,11 +2928,15 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	ieee80211_hw_set(hw, MFP_CAPABLE);

	ieee80211_hw_set(hw, SIGNAL_DBM);

	ieee80211_hw_set(hw, SUPPORTS_PS);

	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);

	ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);

	ieee80211_hw_set(hw, PS_NULLFUNC_STACK);

	ieee80211_hw_set(hw, TDLS_WIDER_BW);

	if (rctbl)

		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);

	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);



	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

	hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_UAPSD |

CRA Git | Maintained and supported by SUSTech CRA and CCSE