From: Andrey Yurovsky <andrey@cozybit.com>
Date: Mon, 10 Aug 2009 19:15:47 +0000 (-0700)
Subject: mac80211: Use correct sign for mesh active path refresh.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a9e3091bf08ddea35f172549a8a21d5bd6ee6129;p=openwrt%2Fstaging%2Fblogic.git

mac80211: Use correct sign for mesh active path refresh.

On locally originated traffic, we refresh active paths after a timeout.  The
decision to do this was using the wrong sign and therefore the refresh timer
was triggered for every frame.

Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index b54c21cf5f73..1cd1e7273085 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -791,7 +791,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
 	}
 
 	if (mpath->flags & MESH_PATH_ACTIVE) {
-		if (time_after(jiffies, mpath->exp_time -
+		if (time_after(jiffies, mpath->exp_time +
 			msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time))
 				&& !memcmp(sdata->dev->dev_addr, hdr->addr4,
 					   ETH_ALEN)