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

Merge tag 'mac80211-next-for-net-next-2021-04-20' of... 

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



Johannes Berg says:

====================
Another set of updates, all over the map:
 * set sk_pacing_shift for 802.3->802.11 encap offload
 * some monitor support for 802.11->802.3 decap offload
 * HE (802.11ax) spec updates
 * userspace API for TDLS HE support
 * along with various other small features, cleanups and
   fixups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9ad2057 010bfbe7

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

+7 −8
Original line number Diff line number Diff line
@@ -1334,9 +1334,8 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, 
	 * request, then use MAX_AMPDU_LEN_FACTOR as 16 to calculate max_ampdu

	 * length.

	 */

	ampdu_factor = (he_cap->he_cap_elem.mac_cap_info[3] &

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) >>

			IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_SHIFT;

	ampdu_factor = u8_get_bits(he_cap->he_cap_elem.mac_cap_info[3],

				   IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK);



	if (ampdu_factor) {

		if (sta->vht_cap.vht_supported)
@@ -3876,7 +3875,7 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) 
	    IEEE80211_HE_MAC_CAP4_BQR;

	he_cap_elem->mac_cap_info[4] &= ~m;



	m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION |

	m = IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECTIVE_TRANSMISSION |

	    IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |

	    IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING |

	    IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX;
@@ -3886,7 +3885,7 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) 
	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;

	he_cap_elem->phy_cap_info[2] &= ~m;



	m = IEEE80211_HE_PHY_CAP3_RX_HE_MU_PPDU_FROM_NON_AP_STA |

	m = IEEE80211_HE_PHY_CAP3_RX_PARTIAL_BW_SU_IN_20MHZ_MU |

	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK |

	    IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_MASK;

	he_cap_elem->phy_cap_info[3] &= ~m;
@@ -3898,13 +3897,13 @@ ath11k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) 
	he_cap_elem->phy_cap_info[5] &= ~m;



	m = IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |

	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |

	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |

	    IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |

	    IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO;

	he_cap_elem->phy_cap_info[6] &= ~m;



	m = IEEE80211_HE_PHY_CAP7_SRP_BASED_SR |

	    IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |

	m = IEEE80211_HE_PHY_CAP7_PSR_BASED_SR |

	    IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |

	    IEEE80211_HE_PHY_CAP7_STBC_TX_ABOVE_80MHZ |

	    IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;

	he_cap_elem->phy_cap_info[7] &= ~m;

drivers/net/wireless/broadcom/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4053,7 +4053,7 @@ static void b43_update_basic_rates(struct b43_wldev *dev, u32 brates) 
{

	struct ieee80211_supported_band *sband =

		dev->wl->hw->wiphy->bands[b43_current_band(dev->wl)];

	struct ieee80211_rate *rate;

	const struct ieee80211_rate *rate;

	int i;

	u16 basic, direct, offset, basic_offset, rateptr;

drivers/net/wireless/broadcom/b43legacy/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2762,7 +2762,7 @@ static void b43legacy_update_basic_rates(struct b43legacy_wldev *dev, u32 brates 
{

	struct ieee80211_supported_band *sband =

		dev->wl->hw->wiphy->bands[NL80211_BAND_2GHZ];

	struct ieee80211_rate *rate;

	const struct ieee80211_rate *rate;

	int i;

	u16 basic, direct, offset, basic_offset, rateptr;

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+7 −7
Original line number Diff line number Diff line
@@ -550,9 +550,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,

				.mac_cap_info[4] =

					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |

					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU |

					IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,

				.mac_cap_info[5] =

					IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |
@@ -583,11 +583,11 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |

					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				.phy_cap_info[6] =

					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |

					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |

					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |

					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |

					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,

				.phy_cap_info[7] =

					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |

					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |

					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |

					IEEE80211_HE_PHY_CAP7_MAX_NC_1,

				.phy_cap_info[8] =
@@ -636,9 +636,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					IEEE80211_HE_MAC_CAP2_BSR,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,

				.mac_cap_info[4] =

					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,

				.mac_cap_info[5] =

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,

				.phy_cap_info[0] =

drivers/net/wireless/mac80211_hwsim.c

+10 −14
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static const struct nl80211_vendor_cmd_info mac80211_hwsim_vendor_events[] = { 
	{ .vendor_id = OUI_QCA, .subcmd = 1 },

};



static spinlock_t hwsim_radio_lock;

static DEFINE_SPINLOCK(hwsim_radio_lock);

static LIST_HEAD(hwsim_radios);

static struct rhashtable hwsim_radios_rht;

static int hwsim_radio_idx;
@@ -763,7 +763,7 @@ static const struct nla_policy hwsim_genl_policy[HWSIM_ATTR_MAX + 1] = { 
/* MAC80211_HWSIM virtio queues */

static struct virtqueue *hwsim_vqs[HWSIM_NUM_VQS];

static bool hwsim_virtio_enabled;

static spinlock_t hwsim_virtio_lock;

static DEFINE_SPINLOCK(hwsim_virtio_lock);



static void hwsim_virtio_rx_work(struct work_struct *work);

static DECLARE_WORK(hwsim_virtio_rx, hwsim_virtio_rx_work);
@@ -2795,8 +2795,8 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,

				.phy_cap_info[1] =

					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
@@ -2839,8 +2839,8 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,

				.phy_cap_info[1] =

					IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

					IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
@@ -2885,8 +2885,8 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,

				.phy_cap_info[0] =

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
@@ -2933,8 +2933,8 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz[] = { 
					IEEE80211_HE_MAC_CAP2_ACK_EN,

				.mac_cap_info[3] =

					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3,

				.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,

				.phy_cap_info[0] =

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
@@ -4410,8 +4410,6 @@ static struct virtio_driver virtio_hwsim = { 


static int hwsim_register_virtio_driver(void)

{

	spin_lock_init(&hwsim_virtio_lock);



	return register_virtio_driver(&virtio_hwsim);

}
@@ -4440,8 +4438,6 @@ static int __init init_mac80211_hwsim(void) 
	if (channels < 1)

		return -EINVAL;



	spin_lock_init(&hwsim_radio_lock);



	err = rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);

	if (err)

		return err;