Merge branch 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / net / mac80211 / mesh_pathtbl.c

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 7d050ed..cf032a8 100644 (file)
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -287,8 +287,10 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
        struct sk_buff_head failq;
        unsigned long flags;
 
-       BUG_ON(gate_mpath == from_mpath);
-       BUG_ON(!gate_mpath->next_hop);
+       if (WARN_ON(gate_mpath == from_mpath))
+               return;
+       if (WARN_ON(!gate_mpath->next_hop))
+               return;
 
        __skb_queue_head_init(&failq);