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

Commit 63c5723b authored by Rui Paulo's avatar Rui Paulo Committed by John W. Linville
Browse files

mac80211: add nl80211/cfg80211 handling of the new mesh root mode option. 



Signed-off-by: default avatarRui Paulo <rpaulo@gmail.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Reviewed-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Tested-by: default avatarBrian Cavagnolo <brian@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e304bfd3

include/linux/nl80211.h

+3 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,8 @@ enum nl80211_mntr_flags { 
 * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)

 * that it takes for an HWMP information element to propagate across the mesh

 *

 * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not

 *

 * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute

 *

 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -1219,6 +1221,7 @@ enum nl80211_meshconf_params { 
	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,

	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,

	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,

	NL80211_MESHCONF_HWMP_ROOTMODE,



	/* keep last */

	__NL80211_MESHCONF_ATTR_AFTER_LAST,

include/net/cfg80211.h

+1 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ struct mesh_config { 
	u32 dot11MeshHWMPactivePathTimeout;

	u16 dot11MeshHWMPpreqMinInterval;

	u16 dot11MeshHWMPnetDiameterTraversalTime;

	u8  dot11MeshHWMPRootMode;

};



/**

net/mac80211/cfg.c

+7 −0
Original line number Diff line number Diff line
@@ -1029,7 +1029,10 @@ static int ieee80211_set_mesh_params(struct wiphy *wiphy, 
{

	struct mesh_config *conf;

	struct ieee80211_sub_if_data *sdata;

	struct ieee80211_if_mesh *ifmsh;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	ifmsh = &sdata->u.mesh;



	/* Set the config options which we are interested in setting */

	conf = &(sdata->u.mesh.mshcfg);
@@ -1064,6 +1067,10 @@ static int ieee80211_set_mesh_params(struct wiphy *wiphy, 
			   mask))

		conf->dot11MeshHWMPnetDiameterTraversalTime =

			nconf->dot11MeshHWMPnetDiameterTraversalTime;

	if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOTMODE, mask)) {

		conf->dot11MeshHWMPRootMode = nconf->dot11MeshHWMPRootMode;

		ieee80211_mesh_root_setup(ifmsh);

	}

	return 0;

}

net/mac80211/debugfs_netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ IEEE80211_IF_FILE(path_refresh_time, 
		u.mesh.mshcfg.path_refresh_time, DEC);

IEEE80211_IF_FILE(min_discovery_timeout,

		u.mesh.mshcfg.min_discovery_timeout, DEC);

IEEE80211_IF_FILE(dot11MeshHWMPRootMode,

		u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);

#endif

net/mac80211/mesh.c

+13 −0
Original line number Diff line number Diff line
@@ -373,6 +373,17 @@ static void ieee80211_mesh_path_root_timer(unsigned long data) 
	ieee80211_queue_work(&local->hw, &ifmsh->work);

}



void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh)

{

	if (ifmsh->mshcfg.dot11MeshHWMPRootMode)

		set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);

	else {

		clear_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);

		/* stop running timer */

		del_timer_sync(&ifmsh->mesh_path_root_timer);

	}

}



/**

 * ieee80211_fill_mesh_addresses - fill addresses of a locally originated mesh frame

 * @hdr:    	802.11 frame header
@@ -503,6 +514,7 @@ void ieee80211_mesh_restart(struct ieee80211_sub_if_data *sdata) 
		add_timer(&ifmsh->mesh_path_timer);

	if (test_and_clear_bit(TMR_RUNNING_MPR, &ifmsh->timers_running))

		add_timer(&ifmsh->mesh_path_root_timer);

	ieee80211_mesh_root_setup(ifmsh);

}

#endif
@@ -512,6 +524,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_local *local = sdata->local;



	set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags);

	ieee80211_mesh_root_setup(ifmsh);

	ieee80211_queue_work(&local->hw, &ifmsh->work);

	sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |