diff options
| author | Thomas Graf <tgraf@suug.ch> | 2014-07-30 02:31:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 17:41:47 -0700 |
| commit | 80019d310f9fb4f8c9eeda0a5d76144ad3132fdf (patch) | |
| tree | b3abca44d6bdaa3760099bc4be4f7140ca5db82f /net/core | |
| parent | 16eecd9be4b05e3216b8b12707aa6f51fb197903 (diff) | |
| download | linux-80019d310f9fb4f8c9eeda0a5d76144ad3132fdf.tar.bz2 | |
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 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 { |