From: Javier Cardona <javier@cozybit.com>
Date: Tue, 9 Aug 2011 23:45:07 +0000 (-0700)
Subject: mac80211: fix mesh path flushing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=00e3f25c8556384bfec2a168c41e885fa6a7748c;p=linux-beck.git

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>
---

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);
 }