From 3e58091e1a6c791bc54095257877e8fde23e22c8 Mon Sep 17 00:00:00 2001 From: David Woo Date: Wed, 12 Aug 2009 11:03:43 -0700 Subject: [PATCH] --- yaml --- r: 159655 b: refs/heads/master c: 57ef5ddb456649667438e023f67dd3a3ff3fbed8 h: refs/heads/master i: 159653: 2323217dd8c4b2ae34ef8a3446bdcff76cd0c95d 159651: 7812bdee60c35710423d7e46abd12ebb4967df22 159647: c4a3ddd76d09a1025df83d0c606ce6895536a3fe v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ce670353dd1d..36cbfb1c7d3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13311b00117ed1bf903cf8870432504631a7ce77 +refs/heads/master: 57ef5ddb456649667438e023f67dd3a3ff3fbed8 diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index 1cd1e7273085..ef1efd362691 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -397,7 +397,8 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt, - u8 *preq_elem, u32 metric) { + u8 *preq_elem, u32 metric) +{ struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct mesh_path *mpath; u8 *dst_addr, *orig_addr; @@ -430,7 +431,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, if ((!(mpath->flags & MESH_PATH_DSN_VALID)) || DSN_LT(mpath->dsn, dst_dsn)) { mpath->dsn = dst_dsn; - mpath->flags &= MESH_PATH_DSN_VALID; + mpath->flags |= MESH_PATH_DSN_VALID; } else if ((!(dst_flags & MP_F_DO)) && (mpath->flags & MESH_PATH_ACTIVE)) { reply = true;