summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-04-29 15:55:26 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2014-04-29 15:59:27 (GMT)
commit8c5bb1fad0bb9c29f7d817c1e2fdb052b76f04e9 (patch)
tree367302bae08e527e1ede890d8674dc9077b83e7e /net/mac80211/mesh_pathtbl.c
parent2fd0511556538a2d713e7a3d032c51cfe0117642 (diff)
downloadlinux-8c5bb1fad0bb9c29f7d817c1e2fdb052b76f04e9.tar.xz
mac80211: remove BUG_ON usage
These BUG_ON statements should never trigger, but in the unlikely event that somebody does manage don't stop everything but simply exit the code path with an error. Leave the one BUG_ON where changing it would result in a NULL pointer dereference. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r--net/mac80211/mesh_pathtbl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 7d050ed..cf032a8 100644
--- 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);