Commit a0de1ca3 authored by John Crispin's avatar John Crispin Committed by Johannes Berg
Browse files

mac80211: allow turning TWT responder support on and off via netlink 



Allow the userland daemon to en/disable TWT support for an AP.

Signed-off-by: default avatarShashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
[simplify parsing code]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c9d3245e

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ enum cfg80211_ap_settings_flags { 
 * @he_cap: HE capabilities (or %NULL if HE isn't enabled)

 * @ht_required: stations must support HT

 * @vht_required: stations must support VHT

 * @twt_responder: Enable Target Wait Time

 * @flags: flags, as defined in enum cfg80211_ap_settings_flags

 */

struct cfg80211_ap_settings {
@@ -923,6 +924,7 @@ struct cfg80211_ap_settings { 
	const struct ieee80211_vht_cap *vht_cap;

	const struct ieee80211_he_cap_elem *he_cap;

	bool ht_required, vht_required;

	bool twt_responder;

	u32 flags;

};

include/net/mac80211.h

+3 −0
Original line number Diff line number Diff line
@@ -506,6 +506,8 @@ struct ieee80211_ftm_responder_params { 
 * @he_support: does this BSS support HE

 * @twt_requester: does this BSS support TWT requester (relevant for managed

 *	mode only, set if the AP advertises TWT responder role)

 * @twt_responder: does this BSS support TWT requester (relevant for managed

 *	mode only, set if the AP advertises TWT responder role)

 * @assoc: association status

 * @ibss_joined: indicates whether this station is part of an IBSS

 *	or not
@@ -613,6 +615,7 @@ struct ieee80211_bss_conf { 
	u16 frame_time_rts_th;

	bool he_support;

	bool twt_requester;

	bool twt_responder;

	/* association related data */

	bool assoc, ibss_joined;

	bool ibss_creator;

include/uapi/linux/nl80211.h

+4 −0
Original line number Diff line number Diff line
@@ -2354,6 +2354,8 @@ enum nl80211_commands { 
 *	is used with %NL80211_CMD_CONNECT to provide password for offloading

 *	SAE authentication for WPA3-Personal networks.

 *

 * @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support.

 *

 * @NUM_NL80211_ATTR: total number of nl80211_attrs available

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2809,6 +2811,8 @@ enum nl80211_attrs { 


	NL80211_ATTR_SAE_PASSWORD,



	NL80211_ATTR_TWT_RESPONDER,



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



	__NL80211_ATTR_AFTER_LAST,

net/mac80211/cfg.c

+3 −1
Original line number Diff line number Diff line
@@ -975,7 +975,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
		      BSS_CHANGED_BEACON |

		      BSS_CHANGED_SSID |

		      BSS_CHANGED_P2P_PS |

		      BSS_CHANGED_TXPOWER;

		      BSS_CHANGED_TXPOWER |

		      BSS_CHANGED_TWT;

	int err;

	int prev_beacon_int;
@@ -1045,6 +1046,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	sdata->vif.bss_conf.dtim_period = params->dtim_period;

	sdata->vif.bss_conf.enable_beacon = true;

	sdata->vif.bss_conf.allow_p2p_go_ps = sdata->vif.p2p;

	sdata->vif.bss_conf.twt_responder = params->twt_responder;



	sdata->vif.bss_conf.ssid_len = params->ssid_len;

	if (params->ssid_len)

net/wireless/nl80211.c

+4 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_AIRTIME_WEIGHT] = NLA_POLICY_MIN(NLA_U16, 1),

	[NL80211_ATTR_SAE_PASSWORD] = { .type = NLA_BINARY,

					.len = SAE_PASSWORD_MAX_LEN },

	[NL80211_ATTR_TWT_RESPONDER] = { .type = NLA_FLAG },

};



/* policy for the key attributes */
@@ -4628,6 +4629,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) 
			return PTR_ERR(params.acl);

	}



	params.twt_responder =

		    nla_get_flag(info->attrs[NL80211_ATTR_TWT_RESPONDER]);



	nl80211_calculate_ap_params(&params);



	if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])

CRA Git | Maintained and supported by SUSTech CRA and CCSE