From 8478e93930b13ea471ce9bc625a2267456ca5bcb Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Wed, 9 Dec 2009 18:43:01 -0800
Subject: [PATCH] --- yaml --- r: 175557 b: refs/heads/master c:
 7b324d28a94dac5a451e8cba66e8d324601e5b9a h: refs/heads/master i:   175555:
 0924f72f9cadcac31fa33e904ca9cd9e4725eaa9 v: v3

---
 [refs]                         | 2 +-
 trunk/net/mac80211/mesh.h      | 5 +++--
 trunk/net/mac80211/mesh_hwmp.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2077046b6545..280beeef8fce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d618cb81aeea19879975cd1f9a1e707694dfd7c
+refs/heads/master: 7b324d28a94dac5a451e8cba66e8d324601e5b9a
diff --git a/trunk/net/mac80211/mesh.h b/trunk/net/mac80211/mesh.h
index 31e102541869..85562c59d7d6 100644
--- a/trunk/net/mac80211/mesh.h
+++ b/trunk/net/mac80211/mesh.h
@@ -188,8 +188,9 @@ struct mesh_rmc {
  */
 #define MESH_PREQ_MIN_INT	10
 #define MESH_DIAM_TRAVERSAL_TIME 50
-/* Paths will be refreshed if they are closer than PATH_REFRESH_TIME to their
- * expiration
+/* A path will be refreshed if it is used PATH_REFRESH_TIME milliseconds before
+ * timing out.  This way it will remain ACTIVE and no data frames will be
+ * unnecesarily held in the pending queue.
  */
 #define MESH_PATH_REFRESH_TIME			1000
 #define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME)
diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c
index 833b2f3670c5..d28acb6b1f81 100644
--- a/trunk/net/mac80211/mesh_hwmp.c
+++ b/trunk/net/mac80211/mesh_hwmp.c
@@ -937,7 +937,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
 
 	if (mpath->flags & MESH_PATH_ACTIVE) {
 		if (time_after(jiffies,
-			       mpath->exp_time +
+			       mpath->exp_time -
 			       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
 		    !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
 		    !(mpath->flags & MESH_PATH_RESOLVING) &&