Commit 728b19e5 authored by Chun-Yeow Yeoh's avatar Chun-Yeow Yeoh Committed by Johannes Berg
Browse files

{nl,cfg,mac}80211: implement dot11MeshHWMPconfirmationInterval 



As defined in section 13.10.9.3 Case D (802.11-2012), this
control variable is used to limit the mesh STA to send only
one PREQ to a root mesh STA within this interval of time
(in TUs). The default value for this variable is set to
2000 TUs. However, for current implementation, the maximum
configurable of dot11MeshHWMPconfirmationInterval is
restricted by dot11MeshHWMPactivePathTimeout.

Signed-off-by: default avatarChun-Yeow Yeoh <yeohchunyeow@gmail.com>
[line-break commit log]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dbb912cd

include/linux/nl80211.h

+5 −0
Original line number Diff line number Diff line
@@ -2192,6 +2192,10 @@ enum nl80211_mntr_flags { 
 * @NL80211_MESHCONF_HWMP_ROOT_INTERVAL: The interval of time (in TUs) between

 *	proactive PREQs are transmitted.

 *

 * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: 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.

 *

 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use

 */

enum nl80211_meshconf_params {
@@ -2220,6 +2224,7 @@ enum nl80211_meshconf_params { 
	NL80211_MESHCONF_HT_OPMODE,

	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,

	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,

	NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,



	/* keep last */

	__NL80211_MESHCONF_ATTR_AFTER_LAST,

include/net/cfg80211.h

+4 −0
Original line number Diff line number Diff line
@@ -849,6 +849,9 @@ struct bss_parameters { 
 *

 * @dot11MeshHWMProotInterval: The interval of time (in TUs) between proactive

 *	PREQs are transmitted.

 * @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.

 */

struct mesh_config {

	u16 dot11MeshRetryTimeout;
@@ -875,6 +878,7 @@ struct mesh_config { 
	u16 ht_opmode;

	u32 dot11MeshHWMPactivePathToRootTimeout;

	u16 dot11MeshHWMProotInterval;

	u16 dot11MeshHWMPconfirmationInterval;

};



/**

net/mac80211/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -1596,6 +1596,9 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, 
	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))

		conf->dot11MeshHWMProotInterval =

			nconf->dot11MeshHWMProotInterval;

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, mask))

		conf->dot11MeshHWMPconfirmationInterval =

			nconf->dot11MeshHWMPconfirmationInterval;

	return 0;

}

net/mac80211/debugfs_netdev.c

+3 −0
Original line number Diff line number Diff line
@@ -514,6 +514,8 @@ IEEE80211_IF_FILE(dot11MeshHWMPactivePathToRootTimeout, 
		  u.mesh.mshcfg.dot11MeshHWMPactivePathToRootTimeout, DEC);

IEEE80211_IF_FILE(dot11MeshHWMProotInterval,

		  u.mesh.mshcfg.dot11MeshHWMProotInterval, DEC);

IEEE80211_IF_FILE(dot11MeshHWMPconfirmationInterval,

		  u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval, DEC);

#endif



#define DEBUGFS_ADD_MODE(name, mode) \
@@ -617,6 +619,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata) 
	MESHPARAMS_ADD(ht_opmode);

	MESHPARAMS_ADD(dot11MeshHWMPactivePathToRootTimeout);

	MESHPARAMS_ADD(dot11MeshHWMProotInterval);

	MESHPARAMS_ADD(dot11MeshHWMPconfirmationInterval);

#undef MESHPARAMS_ADD

}

#endif

net/mac80211/mesh.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ enum mesh_deferred_task_flags { 
 * an mpath to a hash bucket on a path table.

 * @rann_snd_addr: the RANN sender address

 * @rann_metric: the aggregated path metric towards the root node

 * @last_preq_to_root: Timestamp of last PREQ sent to root

 * @is_root: the destination station of this path is a root node

 * @is_gate: the destination station of this path is a mesh gate

 *
@@ -131,6 +132,7 @@ struct mesh_path { 
	spinlock_t state_lock;

	u8 rann_snd_addr[ETH_ALEN];

	u32 rann_metric;

	unsigned long last_preq_to_root;

	bool is_root;

	bool is_gate;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE