Commit 04a55c94 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-for-net-2020-10-30' of... 

Merge tag 'mac80211-for-net-2020-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
A couple of fixes, for
 * HE on 2.4 GHz
 * a few issues syzbot found, but we have many more reports :-(
 * a regression in nl80211-transported EAPOL frames which had
   affected a number of users, from Mathy
 * kernel-doc markings in mac80211, from Mauro
 * a format argument in reg.c, from Ye Bin
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 859191b2 c2f46814

include/net/cfg80211.h

+5 −4
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ int cfg80211_check_station_change(struct wiphy *wiphy, 
				  enum cfg80211_station_type statype);



/**

 * enum station_info_rate_flags - bitrate info flags

 * enum rate_info_flags - bitrate info flags

 *

 * Used by the driver to indicate the specific rate transmission

 * type for 802.11n transmissions.
@@ -1517,7 +1517,7 @@ struct rate_info { 
};



/**

 * enum station_info_rate_flags - bitrate info flags

 * enum bss_param_flags - bitrate info flags

 *

 * Used by the driver to indicate the specific rate transmission

 * type for 802.11n transmissions.
@@ -6467,7 +6467,8 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, 
			  struct ieee80211_channel *channel, gfp_t gfp);



/**

 * cfg80211_notify_new_candidate - notify cfg80211 of a new mesh peer candidate

 * cfg80211_notify_new_peer_candidate - notify cfg80211 of a new mesh peer

 * 					candidate

 *

 * @dev: network device

 * @macaddr: the MAC address of the new candidate
@@ -7606,7 +7607,7 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate); 
void cfg80211_unregister_wdev(struct wireless_dev *wdev);



/**

 * struct cfg80211_ft_event - FT Information Elements

 * struct cfg80211_ft_event_params - FT Information Elements

 * @ies: FT IEs

 * @ies_len: length of the FT IE in bytes

 * @target_ap: target AP's MAC address

include/net/mac80211.h

+4 −3
Original line number Diff line number Diff line
@@ -3311,7 +3311,7 @@ enum ieee80211_roc_type { 
};



/**

 * enum ieee80211_reconfig_complete_type - reconfig type

 * enum ieee80211_reconfig_type - reconfig type

 *

 * This enum is used by the reconfig_complete() callback to indicate what

 * reconfiguration type was completed.
@@ -6334,7 +6334,8 @@ bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, 
			      int band, struct ieee80211_sta **sta);



/**

 * Sanity-check and parse the radiotap header of injected frames

 * ieee80211_parse_tx_radiotap - Sanity-check and parse the radiotap header

 *				 of injected frames

 * @skb: packet injected by userspace

 * @dev: the &struct device of this 802.11 device

 */
@@ -6389,7 +6390,7 @@ int ieee80211_parse_p2p_noa(const struct ieee80211_p2p_noa_attr *attr, 
void ieee80211_update_p2p_noa(struct ieee80211_noa_data *data, u32 tsf);



/**

 * ieee80211_tdls_oper - request userspace to perform a TDLS operation

 * ieee80211_tdls_oper_request - request userspace to perform a TDLS operation

 * @vif: virtual interface

 * @peer: the peer's destination address

 * @oper: the requested TDLS operation

net/mac80211/mlme.c

+2 −1
Original line number Diff line number Diff line
@@ -5464,6 +5464,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
			struct cfg80211_assoc_request *req)

{

	bool is_6ghz = req->bss->channel->band == NL80211_BAND_6GHZ;

	bool is_5ghz = req->bss->channel->band == NL80211_BAND_5GHZ;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_bss *bss = (void *)req->bss->priv;
@@ -5616,7 +5617,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	if (vht_ie && vht_ie[1] >= sizeof(struct ieee80211_vht_cap))

		memcpy(&assoc_data->ap_vht_cap, vht_ie + 2,

		       sizeof(struct ieee80211_vht_cap));

	else if (!is_6ghz)

	else if (is_5ghz)

		ifmgd->flags |= IEEE80211_STA_DISABLE_VHT |

				IEEE80211_STA_DISABLE_HE;

	rcu_read_unlock();

net/mac80211/sta_info.c

+18 −0
Original line number Diff line number Diff line
@@ -258,6 +258,24 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata, 
 */

void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)

{

	/*

	 * If we had used sta_info_pre_move_state() then we might not

	 * have gone through the state transitions down again, so do

	 * it here now (and warn if it's inserted).

	 *

	 * This will clear state such as fast TX/RX that may have been

	 * allocated during state transitions.

	 */

	while (sta->sta_state > IEEE80211_STA_NONE) {

		int ret;



		WARN_ON_ONCE(test_sta_flag(sta, WLAN_STA_INSERTED));



		ret = sta_info_move_state(sta, sta->sta_state - 1);

		if (WARN_ONCE(ret, "sta_info_move_state() returned %d\n", ret))

			break;

	}



	if (sta->rate_ctrl)

		rate_control_free_sta(sta);

net/mac80211/sta_info.h

+8 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ int sta_info_init(struct ieee80211_local *local); 
void sta_info_stop(struct ieee80211_local *local);



/**

 * sta_info_flush - flush matching STA entries from the STA table

 * __sta_info_flush - flush matching STA entries from the STA table

 *

 * Returns the number of removed STA entries.

 *
@@ -794,6 +794,13 @@ void sta_info_stop(struct ieee80211_local *local); 
 */

int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans);



/**

 * sta_info_flush - flush matching STA entries from the STA table

 *

 * Returns the number of removed STA entries.

 *

 * @sdata: sdata to remove all stations from

 */

static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata)

{

	return __sta_info_flush(sdata, false);