diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 14:19:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 14:19:31 -0800 |
| commit | ba2dca91f000e4796c23d14834680dd90528842f (patch) | |
| tree | fd27c7383f779c1276bed7a1ddaea81efc4395a2 /net/mac80211/mesh_hwmp.c | |
| parent | c557c15d83ea16e6c1a043c8eccb0f60bb19cb96 (diff) | |
| parent | 65182b9fb004220f250d4269c864cf0f1f372e85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 833b2f3670c..d28acb6b1f8 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/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) && |