{cfg,nl}80211: mesh power mode primitives and userspace access

Add the nl80211_mesh_power_mode enumeration which holds possible values for the mesh power mode. These modes are unknown, active, light sleep and deep sleep. Add power_mode entry to the mesh config structure to hold the user-configured default mesh power mode. This value will be used for new peer links. Add the dot11MeshAwakeWindowDuration value to the mesh config. The awake window is a duration in TU describing how long the STA will stay awake after transmitting its beacon in PS mode. Add access routines to: - get/set local link-specific power mode (STA) - get remote STA's link-specific power mode (STA) - get remote STA's non-peer power mode (STA) - get/set default mesh power mode (mesh config) - get/set mesh awake window duration (mesh config) All config changes may be done at mesh runtime and take effect immediately.

Marco Porsch committed 13 years ago

Commit 3b1c5a51 parent 9bdbf044 files · +113 −1Browse files

Unified · Split

4 files

include/net/cfg80211.h +21 −0
include/uapi/linux/nl80211.h +47 −0
net/wireless/mesh.c +3 −0
net/wireless/nl80211.c +42 −1

include/net/cfg80211.h+21−0

  * @sta_modify_mask: bitmap indicating which parameters changed
  *	(for those that don't have a natural "no change" value),
  *	see &enum station_parameters_apply_mask
+ * @local_pm: local link-specific mesh power save mode (no change when set
+ *	to unknown)
  */
 struct station_parameters {
 	u8 *supported_rates;
 	struct ieee80211_vht_cap *vht_capa;
 	u8 uapsd_queues;
 	u8 max_sp;
+	enum nl80211_mesh_power_mode local_pm;
 };
 /**
  * @STATION_INFO_STA_FLAGS: @sta_flags filled
  * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
  * @STATION_INFO_T_OFFSET: @t_offset filled
+ * @STATION_INFO_LOCAL_PM: @local_pm filled
+ * @STATION_INFO_PEER_PM: @peer_pm filled
+ * @STATION_INFO_NONPEER_PM: @nonpeer_pm filled
  */
 enum station_info_flags {
 	STATION_INFO_INACTIVE_TIME	= 1<<0,
 	STATION_INFO_STA_FLAGS		= 1<<18,
 	STATION_INFO_BEACON_LOSS_COUNT	= 1<<19,
 	STATION_INFO_T_OFFSET		= 1<<20,
+	STATION_INFO_LOCAL_PM		= 1<<21,
+	STATION_INFO_PEER_PM		= 1<<22,
+	STATION_INFO_NONPEER_PM		= 1<<23,
 };
 /**
  * @sta_flags: station flags mask & values
  * @beacon_loss_count: Number of times beacon loss event has triggered.
  * @t_offset: Time offset of the station relative to this host.
+ * @local_pm: local mesh STA power save mode
+ * @peer_pm: peer mesh STA power save mode
+ * @nonpeer_pm: non-peer mesh STA power save mode
  */
 struct station_info {
 	u32 filled;
 	u32 beacon_loss_count;
 	s64 t_offset;
+	enum nl80211_mesh_power_mode local_pm;
+	enum nl80211_mesh_power_mode peer_pm;
+	enum nl80211_mesh_power_mode nonpeer_pm;
 	/*
 	 * Note: Add a new enum station_info_flags value for each new field and
  * @dot11MeshHWMPconfirmationInterval: The minimum interval of time (in TUs)
  *	during which a mesh STA can send only one Action frame containing
  *	a PREQ element for root path confirmation.
+ * @power_mode: The default mesh power save mode which will be the initial
+ *	setting for new peer links.
+ * @dot11MeshAwakeWindowDuration: The duration in TUs the STA will remain awake
+ *	after transmitting its beacon.
  */
 struct mesh_config {
 	u16 dot11MeshRetryTimeout;
 	u32 dot11MeshHWMPactivePathToRootTimeout;
 	u16 dot11MeshHWMProotInterval;
 	u16 dot11MeshHWMPconfirmationInterval;
+	enum nl80211_mesh_power_mode power_mode;
+	u16 dot11MeshAwakeWindowDuration;
 };
 /**

include/uapi/linux/nl80211.h+47−0

@@ -1310,6 +1310,9 @@ enum nl80211_commands { · 1309 unmodified lines
1310	* if not given in START_AP 0 is assumed, if not given in SET_BSS	1310	* if not given in START_AP 0 is assumed, if not given in SET_BSS
1311	* no change is made.	1311	* no change is made.
1312	*	1312	*
		1313	* @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode
		1314	* defined in &enum nl80211_mesh_power_mode.
		1315	*
1313	* @NL80211_ATTR_MAX: highest attribute number currently defined	1316	* @NL80211_ATTR_MAX: highest attribute number currently defined
1314	* @__NL80211_ATTR_AFTER_LAST: internal use	1317	* @__NL80211_ATTR_AFTER_LAST: internal use
1315	*/	1318	*/
@@ -1580,6 +1583,8 @@ enum nl80211_attrs { · 264 unmodified lines
1580	NL80211_ATTR_P2P_CTWINDOW,	1583	NL80211_ATTR_P2P_CTWINDOW,
1581	NL80211_ATTR_P2P_OPPPS,	1584	NL80211_ATTR_P2P_OPPPS,
1582		1585
		1586	NL80211_ATTR_LOCAL_MESH_POWER_MODE,
		1587
1583	/* add attributes here, update the policy in nl80211.c */	1588	/* add attributes here, update the policy in nl80211.c */
1584		1589
1585	__NL80211_ATTR_AFTER_LAST,	1590	__NL80211_ATTR_AFTER_LAST,
@@ -1838,6 +1843,10 @@ enum nl80211_sta_bss_param { · 252 unmodified lines
1838	* @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.	1843	* @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
1839	* @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)	1844	* @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
1840	* @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)	1845	* @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
		1846	* @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode
		1847	* @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
		1848	* @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
		1849	* non-peer STA
1841	* @__NL80211_STA_INFO_AFTER_LAST: internal	1850	* @__NL80211_STA_INFO_AFTER_LAST: internal
1842	* @NL80211_STA_INFO_MAX: highest possible station info attribute	1851	* @NL80211_STA_INFO_MAX: highest possible station info attribute
1843	*/	1852	*/
@@ -1862,6 +1871,9 @@ enum nl80211_sta_info { · 18 unmodified lines
1862	NL80211_STA_INFO_STA_FLAGS,	1871	NL80211_STA_INFO_STA_FLAGS,
1863	NL80211_STA_INFO_BEACON_LOSS,	1872	NL80211_STA_INFO_BEACON_LOSS,
1864	NL80211_STA_INFO_T_OFFSET,	1873	NL80211_STA_INFO_T_OFFSET,
		1874	NL80211_STA_INFO_LOCAL_PM,
		1875	NL80211_STA_INFO_PEER_PM,
		1876	NL80211_STA_INFO_NONPEER_PM,
1865		1877
1866	/* keep last */	1878	/* keep last */
1867	__NL80211_STA_INFO_AFTER_LAST,	1879	__NL80211_STA_INFO_AFTER_LAST,
@@ -2252,6 +2264,34 @@ enum nl80211_mntr_flags { · 384 unmodified lines
2252	NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1	2264	NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
2253	};	2265	};
2254		2266
		2267	/**
		2268	* enum nl80211_mesh_power_mode - mesh power save modes
		2269	*
		2270	* @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is
		2271	* not known or has not been set yet.
		2272	* @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is
		2273	* in Awake state all the time.
		2274	* @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will
		2275	* alternate between Active and Doze states, but will wake up for
		2276	* neighbor's beacons.
		2277	* @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will
		2278	* alternate between Active and Doze states, but may not wake up
		2279	* for neighbor's beacons.
		2280	*
		2281	* @__NL80211_MESH_POWER_AFTER_LAST - internal use
		2282	* @NL80211_MESH_POWER_MAX - highest possible power save level
		2283	*/
		2284
		2285	enum nl80211_mesh_power_mode {
		2286	NL80211_MESH_POWER_UNKNOWN,
		2287	NL80211_MESH_POWER_ACTIVE,
		2288	NL80211_MESH_POWER_LIGHT_SLEEP,
		2289	NL80211_MESH_POWER_DEEP_SLEEP,
		2290
		2291	__NL80211_MESH_POWER_AFTER_LAST,
		2292	NL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1
		2293	};
		2294
2255	/**	2295	/**
2256	* enum nl80211_meshconf_params - mesh configuration parameters	2296	* enum nl80211_meshconf_params - mesh configuration parameters
2257	*	2297	*
@@ -2346,6 +2386,11 @@ enum nl80211_mntr_flags { · 88 unmodified lines
2346	* (in TUs) during which a mesh STA can send only one Action frame	2386	* (in TUs) during which a mesh STA can send only one Action frame
2347	* containing a PREQ element for root path confirmation.	2387	* containing a PREQ element for root path confirmation.
2348	*	2388	*
		2389	* @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.
		2390	* type &enum nl80211_mesh_power_mode (u32)
		2391	*
		2392	* @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
		2393	*
2349	* @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use	2394	* @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
2350	*/	2395	*/
2351	enum nl80211_meshconf_params {	2396	enum nl80211_meshconf_params {
@@ -2375,6 +2420,8 @@ enum nl80211_meshconf_params { · 23 unmodified lines
2375	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,	2420	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
2376	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,	2421	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
2377	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,	2422	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
		2423	NL80211_MESHCONF_POWER_MODE,
		2424	NL80211_MESHCONF_AWAKE_WINDOW,
2378		2425
2379	/* keep last */	2426	/* keep last */
2380	__NL80211_MESHCONF_ATTR_AFTER_LAST,	2427	__NL80211_MESHCONF_ATTR_AFTER_LAST,

net/wireless/mesh.c+3−0

 #define MESH_DEFAULT_BEACON_INTERVAL	1000	/* in 1024 us units (=TUs) */
 #define MESH_DEFAULT_DTIM_PERIOD	2
+#define MESH_DEFAULT_AWAKE_WINDOW	10	/* in 1024 us units (=TUs) */
 const struct mesh_config default_mesh_config = {
 	.dot11MeshRetryTimeout = MESH_RET_T,
 	.dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,
 	.dot11MeshHWMProotInterval = MESH_ROOT_INTERVAL,
 	.dot11MeshHWMPconfirmationInterval = MESH_ROOT_CONFIRMATION_INTERVAL,
+	.power_mode = NL80211_MESH_POWER_ACTIVE,
+	.dot11MeshAwakeWindowDuration = MESH_DEFAULT_AWAKE_WINDOW,
 };
 const struct mesh_setup default_mesh_setup = {

net/wireless/nl80211.c+42−1

 	    nla_put_u32(msg, NL80211_STA_INFO_BEACON_LOSS,
 			sinfo->beacon_loss_count))
 		goto nla_put_failure;
+	if ((sinfo->filled & STATION_INFO_LOCAL_PM) &&
+	    nla_put_u32(msg, NL80211_STA_INFO_LOCAL_PM,
+			sinfo->local_pm))
+		goto nla_put_failure;
+	if ((sinfo->filled & STATION_INFO_PEER_PM) &&
+	    nla_put_u32(msg, NL80211_STA_INFO_PEER_PM,
+			sinfo->peer_pm))
+		goto nla_put_failure;
+	if ((sinfo->filled & STATION_INFO_NONPEER_PM) &&
+	    nla_put_u32(msg, NL80211_STA_INFO_NONPEER_PM,
+			sinfo->nonpeer_pm))
+		goto nla_put_failure;
 	if (sinfo->filled & STATION_INFO_BSS_PARAM) {
 		bss_param = nla_nest_start(msg, NL80211_STA_INFO_BSS_PARAM);
 		if (!bss_param)
 		params.plink_state =
 		    nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_STATE]);
+	if (info->attrs[NL80211_ATTR_LOCAL_MESH_POWER_MODE]) {
+		enum nl80211_mesh_power_mode pm = nla_get_u32(
+			info->attrs[NL80211_ATTR_LOCAL_MESH_POWER_MODE]);
+		if (pm <= NL80211_MESH_POWER_UNKNOWN ||
+		    pm > NL80211_MESH_POWER_MAX)
+			return -EINVAL;
+		params.local_pm = pm;
+	}
 	switch (dev->ieee80211_ptr->iftype) {
 	case NL80211_IFTYPE_AP:
 	case NL80211_IFTYPE_AP_VLAN:
 		/* disallow mesh-specific things */
 		if (params.plink_action)
 			return -EINVAL;
+		if (params.local_pm)
+			return -EINVAL;
 		/* TDLS can't be set, ... */
 		if (params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
 		/* disallow things sta doesn't support */
 		if (params.plink_action)
 			return -EINVAL;
+		if (params.local_pm)
+			return -EINVAL;
 		/* reject any changes other than AUTHORIZED */
 		if (params.sta_flags_mask & ~BIT(NL80211_STA_FLAG_AUTHORIZED))
 			return -EINVAL;
 	    nla_put_u16(msg, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
 			cur_params.dot11MeshHWMProotInterval) ||
 	    nla_put_u16(msg, NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
-			cur_params.dot11MeshHWMPconfirmationInterval))
+			cur_params.dot11MeshHWMPconfirmationInterval) ||
+	    nla_put_u32(msg, NL80211_MESHCONF_POWER_MODE,
+			cur_params.power_mode) ||
+	    nla_put_u16(msg, NL80211_MESHCONF_AWAKE_WINDOW,
+			cur_params.dot11MeshAwakeWindowDuration))
 		goto nla_put_failure;
 	nla_nest_end(msg, pinfoattr);
 	genlmsg_end(msg, hdr);
 	[NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT] = { .type = NLA_U32 },
 	[NL80211_MESHCONF_HWMP_ROOT_INTERVAL] = { .type = NLA_U16 },
 	[NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL] = { .type = NLA_U16 },
+	[NL80211_MESHCONF_POWER_MODE] = { .type = NLA_U32 },
+	[NL80211_MESHCONF_AWAKE_WINDOW] = { .type = NLA_U16 },
 };
 static const struct nla_policy
 				  1, 65535, mask,
 				  NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
 				  nla_get_u16);
+	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, power_mode,
+				  NL80211_MESH_POWER_ACTIVE,
+				  NL80211_MESH_POWER_MAX,
+				  mask, NL80211_MESHCONF_POWER_MODE,
+				  nla_get_u32);
+	FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshAwakeWindowDuration,
+				  0, 65535, mask,
+				  NL80211_MESHCONF_AWAKE_WINDOW, nla_get_u16);
 	if (mask_out)
 		*mask_out = mask;

{cfg,nl}80211: mesh power mode primitives and userspace access

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code