* [PATCH net-next] net: Remove unlikely() for WARN_ON() conditions
@ 2014-07-30 0:31 Thomas Graf
[not found] ` <3d85d9264cad5d116792e896149e41e5f14678ce.1406680126.git.tgraf-G/eBtMaohhA@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Graf @ 2014-07-30 0:31 UTC (permalink / raw)
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA
Cc: dev-yBygre7rU0TnMu66kgdUjQ
No need for the unlikely(), WARN_ON() and BUG_ON() internally use
unlikely() on the condition.
Signed-off-by: Thomas Graf <tgraf-G/eBtMaohhA@public.gmane.org>
---
net/core/dev.c | 2 +-
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 e1b7cfa..b370230 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 7ede507..701b573 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) \
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: Remove unlikely() for WARN_ON() conditions
[not found] ` <3d85d9264cad5d116792e896149e41e5f14678ce.1406680126.git.tgraf-G/eBtMaohhA@public.gmane.org>
@ 2014-07-31 0:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-07-31 0:42 UTC (permalink / raw)
To: tgraf-G/eBtMaohhA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Thomas Graf <tgraf-G/eBtMaohhA@public.gmane.org>
Date: Wed, 30 Jul 2014 02:31:08 +0200
> No need for the unlikely(), WARN_ON() and BUG_ON() internally use
> unlikely() on the condition.
>
> Signed-off-by: Thomas Graf <tgraf-G/eBtMaohhA@public.gmane.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-31 0:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-30 0:31 [PATCH net-next] net: Remove unlikely() for WARN_ON() conditions Thomas Graf
[not found] ` <3d85d9264cad5d116792e896149e41e5f14678ce.1406680126.git.tgraf-G/eBtMaohhA@public.gmane.org>
2014-07-31 0:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).