Netdev List
 help / color / mirror / Atom feed
From: igorm@etf.rs
To: netdev@vger.kernel.org
Cc: eric.dumazet@gmail.com, Igor Maravic <igorm@etf.rs>
Subject: [PATCH] Fix jump_label handling in dev.c
Date: Tue, 29 Nov 2011 11:30:49 +0100	[thread overview]
Message-ID: <1322562649-20876-1-git-send-email-igorm@etf.rs> (raw)
In-Reply-To: <igorm@etf.rs>

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

             reply	other threads:[~2011-11-29 10:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-29 10:30 igorm [this message]
2011-11-29 11:07 ` [PATCH] Fix jump_label handling in dev.c Igor Maravić
2011-11-29 11:15   ` Eric Dumazet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322562649-20876-1-git-send-email-igorm@etf.rs \
    --to=igorm@etf.rs \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox