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

Commit 45904f21 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

nl80211/mac80211: define and allow configuring mesh element TTL 



The TTL in path selection information elements is different from
the mesh ttl used in mesh data frames.  Version 7.03 of the 11s
draft calls this ttl 'Element TTL'.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b9e61f11

include/linux/nl80211.h

+4 −0
Original line number Diff line number Diff line
@@ -1547,6 +1547,9 @@ enum nl80211_mntr_flags { 
 * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh

 * point.

 *

 * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a

 * source mesh point for path selection elements.

 *

 * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically

 * open peer links when we detect compatible mesh peers.

 *
@@ -1593,6 +1596,7 @@ enum nl80211_meshconf_params { 
	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,

	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,

	NL80211_MESHCONF_HWMP_ROOTMODE,

	NL80211_MESHCONF_ELEMENT_TTL,



	/* keep last */

	__NL80211_MESHCONF_ATTR_AFTER_LAST,

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -624,6 +624,8 @@ struct mesh_config { 
	u16 dot11MeshMaxPeerLinks;

	u8  dot11MeshMaxRetries;

	u8  dot11MeshTTL;

	/* ttl used in path selection information elements */

	u8  element_ttl;

	bool auto_open_plinks;

	/* HWMP parameters */

	u8  dot11MeshHWMPmaxPREQretries;

net/mac80211/cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,8 @@ static int ieee80211_set_mesh_params(struct wiphy *wiphy, 
		conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries;

	if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask))

		conf->dot11MeshTTL = nconf->dot11MeshTTL;

	if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))

		conf->dot11MeshTTL = nconf->element_ttl;

	if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))

		conf->auto_open_plinks = nconf->auto_open_plinks;

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask))

net/mac80211/debugfs_netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ IEEE80211_IF_FILE(dot11MeshConfirmTimeout, 
IEEE80211_IF_FILE(dot11MeshHoldingTimeout,

		u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC);

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

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

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

IEEE80211_IF_FILE(dot11MeshMaxPeerLinks,

		u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC);
@@ -355,6 +356,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata) 
	MESHPARAMS_ADD(dot11MeshConfirmTimeout);

	MESHPARAMS_ADD(dot11MeshHoldingTimeout);

	MESHPARAMS_ADD(dot11MeshTTL);

	MESHPARAMS_ADD(element_ttl);

	MESHPARAMS_ADD(auto_open_plinks);

	MESHPARAMS_ADD(dot11MeshMaxPeerLinks);

	MESHPARAMS_ADD(dot11MeshHWMPactivePathTimeout);

net/mac80211/mesh.c

+1 −0
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) 
	ifmsh->mshcfg.dot11MeshHoldingTimeout = MESH_HOLD_T;

	ifmsh->mshcfg.dot11MeshMaxRetries = MESH_MAX_RETR;

	ifmsh->mshcfg.dot11MeshTTL = MESH_TTL;

	ifmsh->mshcfg.element_ttl = MESH_DEFAULT_ELEMENT_TTL;

	ifmsh->mshcfg.auto_open_plinks = true;

	ifmsh->mshcfg.dot11MeshMaxPeerLinks =

		MESH_MAX_ESTAB_PLINKS;