Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80019d31 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

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: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16eecd9b

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

net/openvswitch/datapath.h

+1 −1
Original line number Diff line number Diff line
@@ -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)					\