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

Merge tag 'mac80211-next-for-net-next-2021-02-12' of... 

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



Johannes Berg says:

====================
Last set of updates:
 * more minstrel work from Felix to reduce the
   probing overhead
 * QoS for nl80211 control port frames
 * STBC injection support
 * and a couple of small fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93efb0c6 735a4848

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -2583,12 +2583,14 @@ struct cfg80211_auth_request { 
 *	authentication capability. Drivers can offload authentication to

 *	userspace if this flag is set. Only applicable for cfg80211_connect()

 *	request (connect callback).

 * @ASSOC_REQ_DISABLE_HE:  Disable HE

 */

enum cfg80211_assoc_req_flags {

	ASSOC_REQ_DISABLE_HT			= BIT(0),

	ASSOC_REQ_DISABLE_VHT			= BIT(1),

	ASSOC_REQ_USE_RRM			= BIT(2),

	CONNECT_REQ_EXTERNAL_AUTH_SUPPORT	= BIT(3),

	ASSOC_REQ_DISABLE_HE			= BIT(4),

};



/**

include/uapi/linux/nl80211.h

+11 −2
Original line number Diff line number Diff line
@@ -1964,7 +1964,14 @@ enum nl80211_commands { 
 *	probe-response frame. The DA field in the 802.11 header is zero-ed out,

 *	to be filled by the FW.

 * @NL80211_ATTR_DISABLE_HT: Force HT capable interfaces to disable

 *      this feature.  Currently, only supported in mac80211 drivers.

 *      this feature during association. This is a flag attribute.

 *	Currently only supported in mac80211 drivers.

 * @NL80211_ATTR_DISABLE_VHT: Force VHT capable interfaces to disable

 *      this feature during association. This is a flag attribute.

 *	Currently only supported in mac80211 drivers.

 * @NL80211_ATTR_DISABLE_HE: Force HE capable interfaces to disable

 *      this feature during association. This is a flag attribute.

 *	Currently only supported in mac80211 drivers.

 * @NL80211_ATTR_HT_CAPABILITY_MASK: Specify which bits of the

 *      ATTR_HT_CAPABILITY to which attention should be paid.

 *      Currently, only mac80211 NICs support this feature.
@@ -3045,6 +3052,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_SAR_SPEC,



	NL80211_ATTR_DISABLE_HE,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,

net/mac80211/mesh_hwmp.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ u32 airtime_link_metric_get(struct ieee80211_local *local, 
	 */

	tx_time = (device_constant + 10 * test_frame_len / rate);

	estimated_retx = ((1 << (2 * ARITH_SHIFT)) / (s_unit - err));

	result = (tx_time * estimated_retx) >> (2 * ARITH_SHIFT);

	result = ((u64)tx_time * estimated_retx) >> (2 * ARITH_SHIFT);

	return (u32)result;

}

net/mac80211/mlme.c

+3 −0
Original line number Diff line number Diff line
@@ -5754,6 +5754,9 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, 
	if (req->flags & ASSOC_REQ_DISABLE_VHT)

		ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;



	if (req->flags & ASSOC_REQ_DISABLE_HE)

		ifmgd->flags |= IEEE80211_STA_DISABLE_HE;



	err = ieee80211_prep_connection(sdata, req->bss, true, override);

	if (err)

		goto err_clear;

net/mac80211/rc80211_minstrel_ht.c

+383 −383

File changed.

Preview size limit exceeded, changes collapsed.