From: Javier Cardona Date: Tue, 9 Aug 2011 23:45:07 +0000 (-0700) Subject: mac80211: fix mesh path flushing X-Git-Tag: firefly_0821_release~3680^2~4273^2~254^2~275 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00e3f25c8556384bfec2a168c41e885fa6a7748c;p=firefly-linux-kernel-4.4.55.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 Signed-off-by: John W. Linville --- 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); }