diff options
author | 2014-07-30 02:31:08 +0200 | |
---|---|---|
committer | 2014-07-30 17:41:47 -0700 | |
commit | 80019d310f9fb4f8c9eeda0a5d76144ad3132fdf (patch) | |
tree | b3abca44d6bdaa3760099bc4be4f7140ca5db82f | |
parent | dcbnl : Fix misleading dcb_app->priority explanation (diff) | |
download | linux-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.tar.gz linux-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.tar.bz2 linux-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.zip |
net: Remove unlikely() for WARN_ON() conditions
No need for the unlikely(), WARN_ON() and BUG_ON() internally use
unlikely() on the condition.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/openvswitch/datapath.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e1b7cfaccd65..b370230fe1d3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2326,7 +2326,7 @@ __be16 skb_network_protocol(struct sk_buff *skb, int *depth) */ if (type == htons(ETH_P_8021Q) || type == htons(ETH_P_8021AD)) { if (vlan_depth) { - if (unlikely(WARN_ON(vlan_depth < VLAN_HLEN))) + if (WARN_ON(vlan_depth < VLAN_HLEN)) return 0; vlan_depth -= VLAN_HLEN; } else { diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 7ede507500d7..701b5738c38a 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -144,7 +144,7 @@ int lockdep_ovsl_is_held(void); #define lockdep_ovsl_is_held() 1 #endif -#define ASSERT_OVSL() WARN_ON(unlikely(!lockdep_ovsl_is_held())) +#define ASSERT_OVSL() WARN_ON(!lockdep_ovsl_is_held()) #define ovsl_dereference(p) \ rcu_dereference_protected(p, lockdep_ovsl_is_held()) #define rcu_dereference_ovsl(p) \ |