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

Merge tag 'mac80211-next-for-net-next-2020-09-21' of... 

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



Johannes Berg says:

====================
This time we have:
 * some AP-side infrastructure for FILS discovery and
   unsolicited probe resonses
 * a major rework of the encapsulation/header conversion
   offload from Felix, to fit better with e.g. AP_VLAN
   interfaces
 * performance fix for VHT A-MPDU size, don't limit to HT
 * some initial patches for S1G (sub 1 GHz) support, more
   will come in this area
 * minor cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ba6baf6 7fba53eb

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb) 
	if (test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags))

		return HAL_TCL_ENCAP_TYPE_RAW;



	if (tx_info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP)

	if (tx_info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)

		return HAL_TCL_ENCAP_TYPE_ETHERNET;



	return HAL_TCL_ENCAP_TYPE_NATIVE_WIFI;
@@ -98,7 +98,7 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, 
	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))

		return -ESHUTDOWN;



	if (!(info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) &&

	if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) &&

	    !ieee80211_is_data(hdr->frame_control))

		return -ENOTSUPP;

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

+36 −29
Original line number Diff line number Diff line
@@ -3936,7 +3936,7 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, 
		return -ENOSPC;



	info = IEEE80211_SKB_CB(skb);

	if (!(info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP)) {

	if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)) {

		if ((ieee80211_is_action(hdr->frame_control) ||

		     ieee80211_is_deauth(hdr->frame_control) ||

		     ieee80211_is_disassoc(hdr->frame_control)) &&
@@ -4063,7 +4063,7 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw, 
	bool is_prb_rsp;

	int ret;



	if (info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) {

	if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) {

		skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP;

	} else if (ieee80211_is_mgmt(hdr->frame_control)) {

		is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control);
@@ -4349,6 +4349,37 @@ static int ath11k_set_he_mu_sounding_mode(struct ath11k *ar, 
	return ret;

}



static void ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw,

					    struct ieee80211_vif *vif)

{

	struct ath11k *ar = hw->priv;

	struct ath11k_base *ab = ar->ab;

	struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);

	u32 param_id, param_value;

	int ret;



	param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE;

	if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET ||

	    (vif->type != NL80211_IFTYPE_STATION &&

	     vif->type != NL80211_IFTYPE_AP))

		vif->offload_flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;



	if (vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED)

		param_value = ATH11K_HW_TXRX_ETHERNET;

	else if (test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags))

		param_value = ATH11K_HW_TXRX_RAW;

	else

		param_value = ATH11K_HW_TXRX_NATIVE_WIFI;



	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,

					    param_id, param_value);

	if (ret) {

		ath11k_warn(ab, "failed to set vdev %d tx encap mode: %d\n",

			    arvif->vdev_id, ret);

		vif->offload_flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED;

	}

}



static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,

				       struct ieee80211_vif *vif)

{
@@ -4358,7 +4389,6 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw, 
	struct vdev_create_params vdev_param = {0};

	struct peer_create_params peer_param;

	u32 param_id, param_value;

	int hw_encap = 0;

	u16 nss;

	int i;

	int ret;
@@ -4452,32 +4482,7 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw, 
	list_add(&arvif->list, &ar->arvifs);

	spin_unlock_bh(&ar->data_lock);



	param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE;

	if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET)

		switch (vif->type) {

		case NL80211_IFTYPE_STATION:

		case NL80211_IFTYPE_AP_VLAN:

		case NL80211_IFTYPE_AP:

			hw_encap = 1;

			break;

		default:

			break;

		}



	if (ieee80211_set_hw_80211_encap(vif, hw_encap))

		param_value = ATH11K_HW_TXRX_ETHERNET;

	else if (test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags))

		param_value = ATH11K_HW_TXRX_RAW;

	else

		param_value = ATH11K_HW_TXRX_NATIVE_WIFI;



	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,

					    param_id, param_value);

	if (ret) {

		ath11k_warn(ab, "failed to set vdev %d tx encap mode: %d\n",

			    arvif->vdev_id, ret);

		goto err_vdev_del;

	}

	ath11k_mac_op_update_vif_offload(hw, vif);



	nss = get_num_chains(ar->cfg_tx_chainmask) ? : 1;

	ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id,
@@ -5840,6 +5845,7 @@ static const struct ieee80211_ops ath11k_ops = { 
	.reconfig_complete              = ath11k_mac_op_reconfig_complete,

	.add_interface                  = ath11k_mac_op_add_interface,

	.remove_interface		= ath11k_mac_op_remove_interface,

	.update_vif_offload		= ath11k_mac_op_update_vif_offload,

	.config                         = ath11k_mac_op_config,

	.bss_info_changed               = ath11k_mac_op_bss_info_changed,

	.configure_filter		= ath11k_mac_op_configure_filter,
@@ -6148,6 +6154,7 @@ static int __ath11k_mac_register(struct ath11k *ar) 
	ieee80211_hw_set(ar->hw, QUEUE_CONTROL);

	ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);

	ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK);

	ieee80211_hw_set(ar->hw, SUPPORTS_TX_ENCAP_OFFLOAD);

	if (ht_cap & WMI_HT_CAP_ENABLED) {

		ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION);

		ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW);

include/linux/ieee80211.h

+78 −78
Original line number Diff line number Diff line
@@ -2330,84 +2330,84 @@ ieee80211_he_spr_size(const u8 *he_spr_ie) 
}



/* S1G Capabilities Information field */

#define S1G_CAPAB_B0_S1G_LONG BIT(0)

#define S1G_CAPAB_B0_SGI_1MHZ BIT(1)

#define S1G_CAPAB_B0_SGI_2MHZ BIT(2)

#define S1G_CAPAB_B0_SGI_4MHZ BIT(3)

#define S1G_CAPAB_B0_SGI_8MHZ BIT(4)

#define S1G_CAPAB_B0_SGI_16MHZ BIT(5)

#define S1G_CAPAB_B0_SUPP_CH_WIDTH_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B0_SUPP_CH_WIDTH_SHIFT 6



#define S1G_CAPAB_B1_RX_LDPC BIT(0)

#define S1G_CAPAB_B1_TX_STBC BIT(1)

#define S1G_CAPAB_B1_RX_STBC BIT(2)

#define S1G_CAPAB_B1_SU_BFER BIT(3)

#define S1G_CAPAB_B1_SU_BFEE BIT(4)

#define S1G_CAPAB_B1_BFEE_STS_MASK (BIT(5) | BIT(6) | BIT(7))

#define S1G_CAPAB_B1_BFEE_STS_SHIFT 5



#define S1G_CAPAB_B2_SOUNDING_DIMENSIONS_MASK (BIT(0) | BIT(1) | BIT(2))

#define S1G_CAPAB_B2_SOUNDING_DIMENSIONS_SHIFT 0

#define S1G_CAPAB_B2_MU_BFER BIT(3)

#define S1G_CAPAB_B2_MU_BFEE BIT(4)

#define S1G_CAPAB_B2_PLUS_HTC_VHT BIT(5)

#define S1G_CAPAB_B2_TRAVELING_PILOT_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B2_TRAVELING_PILOT_SHIFT 6



#define S1G_CAPAB_B3_RD_RESPONDER BIT(0)

#define S1G_CAPAB_B3_HT_DELAYED_BA BIT(1)

#define S1G_CAPAB_B3_MAX_MPDU_LEN BIT(2)

#define S1G_CAPAB_B3_MAX_AMPDU_LEN_EXP_MASK (BIT(3) | BIT(4))

#define S1G_CAPAB_B3_MAX_AMPDU_LEN_EXP_SHIFT 3

#define S1G_CAPAB_B3_MIN_MPDU_START_MASK (BIT(5) | BIT(6) | BIT(7))

#define S1G_CAPAB_B3_MIN_MPDU_START_SHIFT 5



#define S1G_CAPAB_B4_UPLINK_SYNC BIT(0)

#define S1G_CAPAB_B4_DYNAMIC_AID BIT(1)

#define S1G_CAPAB_B4_BAT BIT(2)

#define S1G_CAPAB_B4_TIME_ADE BIT(3)

#define S1G_CAPAB_B4_NON_TIM BIT(4)

#define S1G_CAPAB_B4_GROUP_AID BIT(5)

#define S1G_CAPAB_B4_STA_TYPE_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B4_STA_TYPE_SHIFT 6



#define S1G_CAPAB_B5_CENT_AUTH_CONTROL BIT(0)

#define S1G_CAPAB_B5_DIST_AUTH_CONTROL BIT(1)

#define S1G_CAPAB_B5_AMSDU BIT(2)

#define S1G_CAPAB_B5_AMPDU BIT(3)

#define S1G_CAPAB_B5_ASYMMETRIC_BA BIT(4)

#define S1G_CAPAB_B5_FLOW_CONTROL BIT(5)

#define S1G_CAPAB_B5_SECTORIZED_BEAM_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B5_SECTORIZED_BEAM_SHIFT 6



#define S1G_CAPAB_B6_OBSS_MITIGATION BIT(0)

#define S1G_CAPAB_B6_FRAGMENT_BA BIT(1)

#define S1G_CAPAB_B6_NDP_PS_POLL BIT(2)

#define S1G_CAPAB_B6_RAW_OPERATION BIT(3)

#define S1G_CAPAB_B6_PAGE_SLICING BIT(4)

#define S1G_CAPAB_B6_TXOP_SHARING_IMP_ACK BIT(5)

#define S1G_CAPAB_B6_VHT_LINK_ADAPT_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B6_VHT_LINK_ADAPT_SHIFT 6



#define S1G_CAPAB_B7_TACK_AS_PS_POLL BIT(0)

#define S1G_CAPAB_B7_DUP_1MHZ BIT(1)

#define S1G_CAPAB_B7_MCS_NEGOTIATION BIT(2)

#define S1G_CAPAB_B7_1MHZ_CTL_RESPONSE_PREAMBLE BIT(3)

#define S1G_CAPAB_B7_NDP_BFING_REPORT_POLL BIT(4)

#define S1G_CAPAB_B7_UNSOLICITED_DYN_AID BIT(5)

#define S1G_CAPAB_B7_SECTOR_TRAINING_OPERATION BIT(6)

#define S1G_CAPAB_B7_TEMP_PS_MODE_SWITCH BIT(7)



#define S1G_CAPAB_B8_TWT_GROUPING BIT(0)

#define S1G_CAPAB_B8_BDT BIT(1)

#define S1G_CAPAB_B8_COLOR_MASK (BIT(2) | BIT(3) | BIT(4))

#define S1G_CAPAB_B8_COLOR_SHIFT 2

#define S1G_CAPAB_B8_TWT_REQUEST BIT(5)

#define S1G_CAPAB_B8_TWT_RESPOND BIT(6)

#define S1G_CAPAB_B8_PV1_FRAME BIT(7)



#define S1G_CAPAB_B9_LINK_ADAPT_PER_CONTROL_RESPONSE BIT(0)

#define S1G_CAP0_S1G_LONG	BIT(0)

#define S1G_CAP0_SGI_1MHZ	BIT(1)

#define S1G_CAP0_SGI_2MHZ	BIT(2)

#define S1G_CAP0_SGI_4MHZ	BIT(3)

#define S1G_CAP0_SGI_8MHZ	BIT(4)

#define S1G_CAP0_SGI_16MHZ	BIT(5)

#define S1G_CAP0_SUPP_CH_WIDTH	GENMASK(7, 6)



#define S1G_SUPP_CH_WIDTH_2	0

#define S1G_SUPP_CH_WIDTH_4	1

#define S1G_SUPP_CH_WIDTH_8	2

#define S1G_SUPP_CH_WIDTH_16	3

#define S1G_SUPP_CH_WIDTH_MAX(cap) ((1 << FIELD_GET(S1G_CAP0_SUPP_CH_WIDTH, \

						    cap[0])) << 1)



#define S1G_CAP1_RX_LDPC	BIT(0)

#define S1G_CAP1_TX_STBC	BIT(1)

#define S1G_CAP1_RX_STBC	BIT(2)

#define S1G_CAP1_SU_BFER	BIT(3)

#define S1G_CAP1_SU_BFEE	BIT(4)

#define S1G_CAP1_BFEE_STS	GENMASK(7, 5)



#define S1G_CAP2_SOUNDING_DIMENSIONS	GENMASK(2, 0)

#define S1G_CAP2_MU_BFER		BIT(3)

#define S1G_CAP2_MU_BFEE		BIT(4)

#define S1G_CAP2_PLUS_HTC_VHT		BIT(5)

#define S1G_CAP2_TRAVELING_PILOT	GENMASK(7, 6)



#define S1G_CAP3_RD_RESPONDER		BIT(0)

#define S1G_CAP3_HT_DELAYED_BA		BIT(1)

#define S1G_CAP3_MAX_MPDU_LEN		BIT(2)

#define S1G_CAP3_MAX_AMPDU_LEN_EXP	GENMASK(4, 3)

#define S1G_CAP3_MIN_MPDU_START		GENMASK(7, 5)



#define S1G_CAP4_UPLINK_SYNC	BIT(0)

#define S1G_CAP4_DYNAMIC_AID	BIT(1)

#define S1G_CAP4_BAT		BIT(2)

#define S1G_CAP4_TIME_ADE	BIT(3)

#define S1G_CAP4_NON_TIM	BIT(4)

#define S1G_CAP4_GROUP_AID	BIT(5)

#define S1G_CAP4_STA_TYPE	GENMASK(7, 6)



#define S1G_CAP5_CENT_AUTH_CONTROL	BIT(0)

#define S1G_CAP5_DIST_AUTH_CONTROL	BIT(1)

#define S1G_CAP5_AMSDU			BIT(2)

#define S1G_CAP5_AMPDU			BIT(3)

#define S1G_CAP5_ASYMMETRIC_BA		BIT(4)

#define S1G_CAP5_FLOW_CONTROL		BIT(5)

#define S1G_CAP5_SECTORIZED_BEAM	GENMASK(7, 6)



#define S1G_CAP6_OBSS_MITIGATION	BIT(0)

#define S1G_CAP6_FRAGMENT_BA		BIT(1)

#define S1G_CAP6_NDP_PS_POLL		BIT(2)

#define S1G_CAP6_RAW_OPERATION		BIT(3)

#define S1G_CAP6_PAGE_SLICING		BIT(4)

#define S1G_CAP6_TXOP_SHARING_IMP_ACK	BIT(5)

#define S1G_CAP6_VHT_LINK_ADAPT		GENMASK(7, 6)



#define S1G_CAP7_TACK_AS_PS_POLL		BIT(0)

#define S1G_CAP7_DUP_1MHZ			BIT(1)

#define S1G_CAP7_MCS_NEGOTIATION		BIT(2)

#define S1G_CAP7_1MHZ_CTL_RESPONSE_PREAMBLE	BIT(3)

#define S1G_CAP7_NDP_BFING_REPORT_POLL		BIT(4)

#define S1G_CAP7_UNSOLICITED_DYN_AID		BIT(5)

#define S1G_CAP7_SECTOR_TRAINING_OPERATION	BIT(6)

#define S1G_CAP7_TEMP_PS_MODE_SWITCH		BIT(7)



#define S1G_CAP8_TWT_GROUPING	BIT(0)

#define S1G_CAP8_BDT		BIT(1)

#define S1G_CAP8_COLOR		GENMASK(4, 2)

#define S1G_CAP8_TWT_REQUEST	BIT(5)

#define S1G_CAP8_TWT_RESPOND	BIT(6)

#define S1G_CAP8_PV1_FRAME	BIT(7)



#define S1G_CAP9_LINK_ADAPT_PER_CONTROL_RESPONSE BIT(0)



#define S1G_OPER_CH_WIDTH_PRIMARY_1MHZ	BIT(0)

#define S1G_OPER_CH_WIDTH_OPER		GENMASK(4, 1)



/* Authentication algorithms */

#define WLAN_AUTH_OPEN 0

include/net/cfg80211.h

+64 −0
Original line number Diff line number Diff line
@@ -96,6 +96,16 @@ struct wiphy; 
 * @IEEE80211_CHAN_NO_10MHZ: 10 MHz bandwidth is not permitted

 *	on this channel.

 * @IEEE80211_CHAN_NO_HE: HE operation is not permitted on this channel.

 * @IEEE80211_CHAN_1MHZ: 1 MHz bandwidth is permitted

 *	on this channel.

 * @IEEE80211_CHAN_2MHZ: 2 MHz bandwidth is permitted

 *	on this channel.

 * @IEEE80211_CHAN_4MHZ: 4 MHz bandwidth is permitted

 *	on this channel.

 * @IEEE80211_CHAN_8MHZ: 8 MHz bandwidth is permitted

 *	on this channel.

 * @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted

 *	on this channel.

 *

 */

enum ieee80211_channel_flags {
@@ -113,6 +123,11 @@ enum ieee80211_channel_flags { 
	IEEE80211_CHAN_NO_20MHZ		= 1<<11,

	IEEE80211_CHAN_NO_10MHZ		= 1<<12,

	IEEE80211_CHAN_NO_HE		= 1<<13,

	IEEE80211_CHAN_1MHZ		= 1<<14,

	IEEE80211_CHAN_2MHZ		= 1<<15,

	IEEE80211_CHAN_4MHZ		= 1<<16,

	IEEE80211_CHAN_8MHZ		= 1<<17,

	IEEE80211_CHAN_16MHZ		= 1<<18,

};



#define IEEE80211_CHAN_NO_HT40 \
@@ -450,6 +465,7 @@ struct ieee80211_sta_s1g_cap { 
 * @ht_cap: HT capabilities in this band

 * @vht_cap: VHT capabilities in this band

 * @edmg_cap: EDMG capabilities in this band

 * @s1g_cap: S1G capabilities in this band (S1B band only, of course)

 * @n_iftype_data: number of iftype data entries

 * @iftype_data: interface type data entries.  Note that the bits in

 *	@types_mask inside this structure cannot overlap (i.e. only
@@ -1067,6 +1083,39 @@ struct cfg80211_acl_data { 
	struct mac_address mac_addrs[];

};



/**

 * struct cfg80211_fils_discovery - FILS discovery parameters from

 * IEEE Std 802.11ai-2016, Annex C.3 MIB detail.

 *

 * @min_interval: Minimum packet interval in TUs (0 - 10000)

 * @max_interval: Maximum packet interval in TUs (0 - 10000)

 * @tmpl_len: Template length

 * @tmpl: Template data for FILS discovery frame including the action

 *	frame headers.

 */

struct cfg80211_fils_discovery {

	u32 min_interval;

	u32 max_interval;

	size_t tmpl_len;

	const u8 *tmpl;

};



/**

 * struct cfg80211_unsol_bcast_probe_resp - Unsolicited broadcast probe

 *	response parameters in 6GHz.

 *

 * @interval: Packet interval in TUs. Maximum allowed is 20 TU, as mentioned

 *	in IEEE P802.11ax/D6.0 26.17.2.3.2 - AP behavior for fast passive

 *	scanning

 * @tmpl_len: Template length

 * @tmpl: Template data for probe response

 */

struct cfg80211_unsol_bcast_probe_resp {

	u32 interval;

	size_t tmpl_len;

	const u8 *tmpl;

};



/**

 * enum cfg80211_ap_settings_flags - AP settings flags

 *
@@ -1114,6 +1163,8 @@ enum cfg80211_ap_settings_flags { 
 * @he_obss_pd: OBSS Packet Detection settings

 * @he_bss_color: BSS Color settings

 * @he_oper: HE operation IE (or %NULL if HE isn't enabled)

 * @fils_discovery: FILS discovery transmission parameters

 * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters

 */

struct cfg80211_ap_settings {

	struct cfg80211_chan_def chandef;
@@ -1144,6 +1195,8 @@ struct cfg80211_ap_settings { 
	u32 flags;

	struct ieee80211_he_obss_pd he_obss_pd;

	struct cfg80211_he_bss_color he_bss_color;

	struct cfg80211_fils_discovery fils_discovery;

	struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;

};



/**
@@ -1787,6 +1840,7 @@ struct mpath_info { 
 *	(or NULL for no change)

 * @basic_rates_len: number of basic rates

 * @ap_isolate: do not forward packets between connected stations

 *	(0 = no, 1 = yes, -1 = do not change)

 * @ht_opmode: HT Operation mode

 *	(u16 = opmode, -1 = do not change)

 * @p2p_ctwindow: P2P CT Window (-1 = no change)
@@ -5278,6 +5332,16 @@ ieee80211_channel_to_khz(const struct ieee80211_channel *chan) 
	return MHZ_TO_KHZ(chan->center_freq) + chan->freq_offset;

}



/**

 * ieee80211_s1g_channel_width - get allowed channel width from @chan

 *

 * Only allowed for band NL80211_BAND_S1GHZ

 * @chan: channel

 * Return: The allowed channel width for this center_freq

 */

enum nl80211_chan_width

ieee80211_s1g_channel_width(const struct ieee80211_channel *chan);



/**

 * ieee80211_channel_to_freq_khz - convert channel number to frequency

 * @chan: channel number

include/net/mac80211.h

+94 −9
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ struct ieee80211_vif_chanctx_switch { 
 * @BSS_CHANGED_TWT: TWT status changed

 * @BSS_CHANGED_HE_OBSS_PD: OBSS Packet Detection status changed.

 * @BSS_CHANGED_HE_BSS_COLOR: BSS Color has changed

 * @BSS_CHANGED_FILS_DISCOVERY: FILS discovery status changed.

 * @BSS_CHANGED_UNSOL_BCAST_PROBE_RESP: Unsolicited broadcast probe response

 *	status changed.

 *

 */

enum ieee80211_bss_change {
@@ -350,6 +353,8 @@ enum ieee80211_bss_change { 
	BSS_CHANGED_TWT			= 1<<27,

	BSS_CHANGED_HE_OBSS_PD		= 1<<28,

	BSS_CHANGED_HE_BSS_COLOR	= 1<<29,

	BSS_CHANGED_FILS_DISCOVERY      = 1<<30,

	BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 1<<31,



	/* when adding here, make sure to change ieee80211_reconfig */

};
@@ -490,6 +495,18 @@ struct ieee80211_ftm_responder_params { 
	size_t civicloc_len;

};



/**

 * struct ieee80211_fils_discovery - FILS discovery parameters from

 * IEEE Std 802.11ai-2016, Annex C.3 MIB detail.

 *

 * @min_interval: Minimum packet interval in TUs (0 - 10000)

 * @max_interval: Maximum packet interval in TUs (0 - 10000)

 */

struct ieee80211_fils_discovery {

	u32 min_interval;

	u32 max_interval;

};



/**

 * struct ieee80211_bss_conf - holds the BSS's changing parameters

 *
@@ -607,6 +624,9 @@ struct ieee80211_ftm_responder_params { 
 * @he_oper: HE operation information of the AP we are connected to

 * @he_obss_pd: OBSS Packet Detection parameters.

 * @he_bss_color: BSS coloring settings, if BSS supports HE

 * @fils_discovery: FILS discovery configuration

 * @unsol_bcast_probe_resp_interval: Unsolicited broadcast probe response

 *	interval.

 */

struct ieee80211_bss_conf {

	const u8 *bssid;
@@ -674,6 +694,8 @@ struct ieee80211_bss_conf { 
	} he_oper;

	struct ieee80211_he_obss_pd he_obss_pd;

	struct cfg80211_he_bss_color he_bss_color;

	struct ieee80211_fils_discovery fils_discovery;

	u32 unsol_bcast_probe_resp_interval;

};



/**
@@ -720,9 +742,8 @@ struct ieee80211_bss_conf { 
 * @IEEE80211_TX_INTFL_OFFCHAN_TX_OK: Internal to mac80211. Used to indicate

 *	that a frame can be transmitted while the queues are stopped for

 *	off-channel operation.

 * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211,

 *	used to indicate that a pending frame requires TX processing before

 *	it can be sent out.

 * @IEEE80211_TX_CTL_HW_80211_ENCAP: This frame uses hardware encapsulation

 *	(header conversion)

 * @IEEE80211_TX_INTFL_RETRIED: completely internal to mac80211,

 *	used to indicate that a frame was already retried due to PS

 * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
@@ -791,7 +812,7 @@ enum mac80211_tx_info_flags { 
	IEEE80211_TX_STAT_AMPDU_NO_BACK		= BIT(11),

	IEEE80211_TX_CTL_RATE_CTRL_PROBE	= BIT(12),

	IEEE80211_TX_INTFL_OFFCHAN_TX_OK	= BIT(13),

	IEEE80211_TX_INTFL_NEED_TXPROCESSING	= BIT(14),

	IEEE80211_TX_CTL_HW_80211_ENCAP		= BIT(14),

	IEEE80211_TX_INTFL_RETRIED		= BIT(15),

	IEEE80211_TX_INTFL_DONT_ENCRYPT		= BIT(16),

	IEEE80211_TX_CTL_NO_PS_BUFFER		= BIT(17),
@@ -823,8 +844,9 @@ enum mac80211_tx_info_flags { 
 * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame

 * @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path

 * @IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP: This frame skips mesh path lookup

 * @IEEE80211_TX_CTRL_HW_80211_ENCAP: This frame uses hardware encapsulation

 *	(header conversion)

 * @IEEE80211_TX_INTCFL_NEED_TXPROCESSING: completely internal to mac80211,

 *	used to indicate that a pending frame requires TX processing before

 *	it can be sent out.

 * @IEEE80211_TX_CTRL_NO_SEQNO: Do not overwrite the sequence number that

 *	has already been assigned to this frame.

 *
@@ -837,7 +859,7 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_CTRL_AMSDU			= BIT(3),

	IEEE80211_TX_CTRL_FAST_XMIT		= BIT(4),

	IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP	= BIT(5),

	IEEE80211_TX_CTRL_HW_80211_ENCAP	= BIT(6),

	IEEE80211_TX_INTCFL_NEED_TXPROCESSING	= BIT(6),

	IEEE80211_TX_CTRL_NO_SEQNO		= BIT(7),

};
@@ -1002,7 +1024,8 @@ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate) 
 * @status.ampdu_ack_len: AMPDU ack length

 * @status.ampdu_len: AMPDU length

 * @status.antenna: (legacy, kept only for iwlegacy)

 * @status.tx_time: airtime consumed for transmission

 * @status.tx_time: airtime consumed for transmission; note this is only

 *	used for WMM AC, not for airtime fairness

 * @status.is_valid_ack_signal: ACK signal is valid

 * @status.status_driver_data: driver use area

 * @ack: union part for pure ACK data
@@ -1095,12 +1118,14 @@ ieee80211_info_get_tx_time_est(struct ieee80211_tx_info *info) 
 * @info: Basic tx status information

 * @skb: Packet skb (can be NULL if not provided by the driver)

 * @rate: The TX rate that was used when sending the packet

 * @free_list: list where processed skbs are stored to be free'd by the driver

 */

struct ieee80211_tx_status {

	struct ieee80211_sta *sta;

	struct ieee80211_tx_info *info;

	struct sk_buff *skb;

	struct rate_info *rate;

	struct list_head *free_list;

};



/**
@@ -1606,6 +1631,21 @@ enum ieee80211_vif_flags { 
	IEEE80211_VIF_GET_NOA_UPDATE		= BIT(3),

};





/**

 * enum ieee80211_offload_flags - virtual interface offload flags

 *

 * @IEEE80211_OFFLOAD_ENCAP_ENABLED: tx encapsulation offload is enabled

 *	The driver supports sending frames passed as 802.3 frames by mac80211.

 *	It must also support sending 802.11 packets for the same interface.

 * @IEEE80211_OFFLOAD_ENCAP_4ADDR: support 4-address mode encapsulation offload

 */



enum ieee80211_offload_flags {

	IEEE80211_OFFLOAD_ENCAP_ENABLED		= BIT(0),

	IEEE80211_OFFLOAD_ENCAP_4ADDR		= BIT(1),

};



/**

 * struct ieee80211_vif - per-interface data

 *
@@ -1626,6 +1666,11 @@ enum ieee80211_vif_flags { 
 *	these need to be set (or cleared) when the interface is added

 *	or, if supported by the driver, the interface type is changed

 *	at runtime, mac80211 will never touch this field

 * @offloaad_flags: hardware offload capabilities/flags for this interface.

 *	These are initialized by mac80211 before calling .add_interface,

 *	.change_interface or .update_vif_offload and updated by the driver

 *	within these ops, based on supported features or runtime change

 *	restrictions.

 * @hw_queue: hardware queue for each AC

 * @cab_queue: content-after-beacon (DTIM beacon really) queue, AP mode only

 * @chanctx_conf: The channel context this interface is assigned to, or %NULL
@@ -1645,6 +1690,8 @@ enum ieee80211_vif_flags { 
 * @txq: the multicast data TX queue (if driver uses the TXQ abstraction)

 * @txqs_stopped: per AC flag to indicate that intermediate TXQs are stopped,

 *	protected by fq->lock.

 * @offload_flags: 802.3 -> 802.11 enapsulation offload flags, see

 *	&enum ieee80211_offload_flags.

 */

struct ieee80211_vif {

	enum nl80211_iftype type;
@@ -1662,6 +1709,7 @@ struct ieee80211_vif { 
	struct ieee80211_chanctx_conf __rcu *chanctx_conf;



	u32 driver_flags;

	u32 offload_flags;



#ifdef CONFIG_MAC80211_DEBUGFS

	struct dentry *debugfs_dir;
@@ -2328,6 +2376,9 @@ struct ieee80211_txq { 
 *	aggregating MPDUs with the same keyid, allowing mac80211 to keep Tx

 *	A-MPDU sessions active while rekeying with Extended Key ID.

 *

 * @IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD: Hardware supports tx encapsulation

 *	offload

 *

 * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays

 */

enum ieee80211_hw_flags {
@@ -2380,6 +2431,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_SUPPORTS_MULTI_BSSID,

	IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID,

	IEEE80211_HW_AMPDU_KEYBORDER_SUPPORT,

	IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD,



	/* keep last, obviously */

	NUM_IEEE80211_HW_FLAGS
@@ -3814,6 +3866,10 @@ enum ieee80211_reconfig_type { 
 * @set_tid_config: Apply TID specific configurations. This callback may sleep.

 * @reset_tid_config: Reset TID specific configuration for the peer.

 *	This callback may sleep.

 * @update_vif_offload: Update virtual interface offload flags

 *	This callback may sleep.

 * @sta_set_4addr: Called to notify the driver when a station starts/stops using

 *	4-address mode

 */

struct ieee80211_ops {

	void (*tx)(struct ieee80211_hw *hw,
@@ -4125,6 +4181,10 @@ struct ieee80211_ops { 
	int (*reset_tid_config)(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta, u8 tids);

	void (*update_vif_offload)(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif);

	void (*sta_set_4addr)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			      struct ieee80211_sta *sta, bool enabled);

};



/**
@@ -5647,7 +5707,7 @@ void ieee80211_send_eosp_nullfunc(struct ieee80211_sta *pubsta, int tid); 
/**

 * ieee80211_sta_register_airtime - register airtime usage for a sta/tid

 *

 * Register airtime usage for a given sta on a given tid. The driver can call

 * Register airtime usage for a given sta on a given tid. The driver must call

 * this function to notify mac80211 that a station used a certain amount of

 * airtime. This information will be used by the TXQ scheduler to schedule

 * stations in a way that ensures airtime fairness.
@@ -6593,4 +6653,29 @@ u32 ieee80211_calc_tx_airtime(struct ieee80211_hw *hw, 
 */

bool ieee80211_set_hw_80211_encap(struct ieee80211_vif *vif, bool enable);



/**

 * ieee80211_get_fils_discovery_tmpl - Get FILS discovery template.

 * @hw: pointer obtained from ieee80211_alloc_hw().

 * @vif: &struct ieee80211_vif pointer from the add_interface callback.

 *

 * The driver is responsible for freeing the returned skb.

 *

 * Return: FILS discovery template. %NULL on error.

 */

struct sk_buff *ieee80211_get_fils_discovery_tmpl(struct ieee80211_hw *hw,

						  struct ieee80211_vif *vif);



/**

 * ieee80211_get_unsol_bcast_probe_resp_tmpl - Get unsolicited broadcast

 *	probe response template.

 * @hw: pointer obtained from ieee80211_alloc_hw().

 * @vif: &struct ieee80211_vif pointer from the add_interface callback.

 *

 * The driver is responsible for freeing the returned skb.

 *

 * Return: Unsolicited broadcast probe response template. %NULL on error.

 */

struct sk_buff *

ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,

					  struct ieee80211_vif *vif);

#endif /* MAC80211_H */