Netdev List
 help / color / mirror / Atom feed
* [PATCH] Fix jump_label handling in dev.c
@ 2011-11-29 10:30 igorm
  2011-11-29 11:07 ` Igor Maravić
  0 siblings, 1 reply; 3+ messages in thread
From: igorm @ 2011-11-29 10:30 UTC (permalink / raw)
  To: netdev; +Cc: eric.dumazet, Igor Maravic

From: Igor Maravic <igorm@etf.rs>

static_branch instead of atomic_read.
Eric forgot to replace that.

Signed-off-by: Igor Maravic <igorm@etf.rs>

:100644 100644 579ce33... d358088... M	net/core/dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 579ce33..d358088 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1482,12 +1482,12 @@ EXPORT_SYMBOL(net_disable_timestamp);
 static inline void net_timestamp_set(struct sk_buff *skb)
 {
 	skb->tstamp.tv64 = 0;
-	if (atomic_read(&netstamp_needed))
+	if (static_branch(&netstamp_needed))
 		__net_timestamp(skb);
 }
 
 #define net_timestamp_check(COND, SKB)			\
-	if (atomic_read(&netstamp_needed)) {		\
+	if (static_branch(&netstamp_needed)) {		\
 		if ((COND) && !(SKB)->tstamp.tv64)	\
 			__net_timestamp(SKB);		\
 	}						\
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-11-29 11:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-29 10:30 [PATCH] Fix jump_label handling in dev.c igorm
2011-11-29 11:07 ` Igor Maravić
2011-11-29 11:15   ` Eric Dumazet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox