summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2011-08-09 16:45:07 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-08-24 13:59:42 -0400
commit00e3f25c8556384bfec2a168c41e885fa6a7748c (patch)
tree652fdd5c7c2d08b5221ec5ab5facc696fc52db3f
parenta6965c44e981214c7483e020106a30a869411231 (diff)
downloadlinux-00e3f25c8556384bfec2a168c41e885fa6a7748c.tar.bz2
mac80211: fix mesh path flushing
Previously, mpaths were never flushed since the mpath is not active once we call this function. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/mesh_pathtbl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 385f9fc526db..bcf7fee53b2c 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -735,8 +735,7 @@ void mesh_path_flush_pending(struct mesh_path *mpath)
{
struct sk_buff *skb;
- while ((skb = skb_dequeue(&mpath->frame_queue)) &&
- (mpath->flags & MESH_PATH_ACTIVE))
+ while ((skb = skb_dequeue(&mpath->frame_queue)) != NULL)
mesh_path_discard_frame(skb, mpath->sdata);
}