From: Javier Cardona <javier@cozybit.com>
Date: Thu, 10 Dec 2009 02:43:00 +0000 (-0800)
Subject: mac80211: Fixed bug in mesh portal paths
X-Git-Tag: firefly_0821_release~11625^2~570
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dde24b6c58b10e27c296f2d343e9512ec0dce874;p=firefly-linux-kernel-4.4.55.git

mac80211: Fixed bug in mesh portal paths

commit 5d618cb81aeea19879975cd1f9a1e707694dfd7c upstream.

Paths to mesh portals were being timed out immediately after each use in
intermediate forwarding nodes.  mppath->exp_time is set to the expiration time
so assigning it to jiffies was marking the path as expired.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 7170bf4565a8..4e14754373a4 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1514,7 +1514,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			mpp_path_add(mesh_hdr->eaddr2, hdr->addr4, sdata);
 		} else {
 			spin_lock_bh(&mppath->state_lock);
-			mppath->exp_time = jiffies;
 			if (compare_ether_addr(mppath->mpp, hdr->addr4) != 0)
 				memcpy(mppath->mpp, hdr->addr4, ETH_ALEN);
 			spin_unlock_bh(&mppath->state_lock);