Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

{nl,cfg,mac}80211: implement dot11MeshHWMProotInterval and dot11MeshHWMPactivePathToRootTimeout 



Add the mesh configuration parameters dot11MeshHWMProotInterval
and dot11MeshHWMPactivePathToRootTimeout to be used by
proactive PREQ mechanism.

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 73c3df3b

include/linux/nl80211.h

+9 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,13 @@ enum nl80211_mntr_flags { 
 *

 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute

 *

 * @NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT: The time (in TUs) for

 *	which mesh STAs receiving a proactive PREQ shall consider the forwarding

 *	information to the root mesh STA to be valid.

 *

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

 *	proactive PREQs are transmitted.

 *

 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use

 */

enum nl80211_meshconf_params {
@@ -2211,6 +2218,8 @@ enum nl80211_meshconf_params { 
	NL80211_MESHCONF_RSSI_THRESHOLD,

	NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,

	NL80211_MESHCONF_HT_OPMODE,

	NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,

	NL80211_MESHCONF_HWMP_ROOT_INTERVAL,



	/* keep last */

	__NL80211_MESHCONF_ATTR_AFTER_LAST,

include/net/cfg80211.h

+9 −0
Original line number Diff line number Diff line
@@ -842,6 +842,13 @@ struct bss_parameters { 
 * @rssi_threshold: the threshold for average signal strength of candidate

 *	station to establish a peer link

 * @ht_opmode: mesh HT protection mode

 *

 * @dot11MeshHWMPactivePathToRootTimeout: The time (in TUs) for which mesh STAs

 *	receiving a proactive PREQ shall consider the forwarding information to

 *	the root mesh STA to be valid.

 *

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

 *	PREQs are transmitted.

 */

struct mesh_config {

	u16 dot11MeshRetryTimeout;
@@ -866,6 +873,8 @@ struct mesh_config { 
	bool dot11MeshForwarding;

	s32 rssi_threshold;

	u16 ht_opmode;

	u32 dot11MeshHWMPactivePathToRootTimeout;

	u16 dot11MeshHWMProotInterval;

};



/**

net/mac80211/cfg.c

+6 −0
Original line number Diff line number Diff line
@@ -1590,6 +1590,12 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, 
		sdata->vif.bss_conf.ht_operation_mode = nconf->ht_opmode;

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);

	}

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))

		conf->dot11MeshHWMPactivePathToRootTimeout =

			nconf->dot11MeshHWMPactivePathToRootTimeout;

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))

		conf->dot11MeshHWMProotInterval =

			nconf->dot11MeshHWMProotInterval;

	return 0;

}

net/mac80211/debugfs_netdev.c

+6 −0
Original line number Diff line number Diff line
@@ -510,6 +510,10 @@ IEEE80211_IF_FILE(dot11MeshHWMPRannInterval, 
IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);

IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC);

IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC);

IEEE80211_IF_FILE(dot11MeshHWMPactivePathToRootTimeout,

		  u.mesh.mshcfg.dot11MeshHWMPactivePathToRootTimeout, DEC);

IEEE80211_IF_FILE(dot11MeshHWMProotInterval,

		  u.mesh.mshcfg.dot11MeshHWMProotInterval, DEC);

#endif



#define DEBUGFS_ADD_MODE(name, mode) \
@@ -611,6 +615,8 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata) 
	MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);

	MESHPARAMS_ADD(rssi_threshold);

	MESHPARAMS_ADD(ht_opmode);

	MESHPARAMS_ADD(dot11MeshHWMPactivePathToRootTimeout);

	MESHPARAMS_ADD(dot11MeshHWMProotInterval);

#undef MESHPARAMS_ADD

}

#endif

net/wireless/mesh.c

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#define MESH_PATH_TIMEOUT	5000

#define MESH_RANN_INTERVAL      5000

#define MESH_PATH_TO_ROOT_TIMEOUT      6000

#define MESH_ROOT_INTERVAL     5000



/*

 * Minimum interval between two consecutive PREQs originated by the same
@@ -62,6 +64,8 @@ const struct mesh_config default_mesh_config = { 
	.dot11MeshForwarding = true,

	.rssi_threshold = MESH_RSSI_THRESHOLD,

	.ht_opmode = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED,

	.dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,

	.dot11MeshHWMProotInterval = MESH_ROOT_INTERVAL,

};



const struct mesh_setup default_mesh_setup = {