mac80211: make mpath path fixing more robust (5df20f21) · Commits · 戴 / test

A fixed mpath was not quite being treated as such: 1) if a PERR frame was received, a fixed mpath was deactivated. 2) queued path discovery for fixed mpath was potentially being considered, changing mpath state. 3) other mpath flags were potentially being inherited when fixing the mpath. Just assign PATH_FIXED and SN_VALID. This solves several issues when fixing a mesh path in one direction. The reverse direction mpath should probably also be fixed, or root announcements at least be enabled. Signed-off-by:

Thomas Pedersen <twp@qca.qualcomm.com> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/mesh_hwmp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -746,6 +746,7 @@ static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata,
		sta = next_hop_deref_protected(mpath);
		if (mpath->flags & MESH_PATH_ACTIVE &&
		ether_addr_equal(ta, sta->sta.addr) &&
		!(mpath->flags & MESH_PATH_FIXED) &&
		(!(mpath->flags & MESH_PATH_SN_VALID) \|\|
		SN_GT(target_sn, mpath->sn) \|\| target_sn == 0)) {
		mpath->flags &= ~MESH_PATH_ACTIVE;
		@@ -1012,7 +1013,7 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata)
		goto enddiscovery;

		spin_lock_bh(&mpath->state_lock);
		if (mpath->flags & MESH_PATH_DELETED) {
		if (mpath->flags & (MESH_PATH_DELETED \| MESH_PATH_FIXED)) {
		spin_unlock_bh(&mpath->state_lock);
		goto enddiscovery;
		}

net/mac80211/mesh_pathtbl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -826,7 +826,7 @@ void mesh_path_fix_nexthop(struct mesh_path mpath, struct sta_info next_hop)
		mpath->metric = 0;
		mpath->hop_count = 0;
		mpath->exp_time = 0;
		mpath->flags \|= MESH_PATH_FIXED;
		mpath->flags = MESH_PATH_FIXED \| MESH_PATH_SN_VALID;
		mesh_path_activate(mpath);
		spin_unlock_bh(&mpath->state_lock);
		mesh_path_tx_pending(mpath);

Admin message