From: Zhi Yong Wu <zwu.kernel@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, therbert@google.com, fengguang.wu@intel.com,
Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Subject: [net-next bugfix] net, rps: fix build failure when CONFIG_RPS isn't set
Date: Wed, 1 Jan 2014 04:31:01 +0800 [thread overview]
Message-ID: <1388521861-17410-1-git-send-email-zwu.kernel@gmail.com> (raw)
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
include/net/sock.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 8ee90ad..bd716b6 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -846,12 +846,16 @@ static inline void sock_rps_reset_flow_hash(__u32 hash)
static inline void sock_rps_record_flow(const struct sock *sk)
{
+#ifdef CONFIG_RPS
sock_rps_record_flow_hash(sk->sk_rxhash);
+#endif
}
static inline void sock_rps_reset_flow(const struct sock *sk)
{
+#ifdef CONFIG_RPS
sock_rps_reset_flow_hash(sk->sk_rxhash);
+#endif
}
static inline void sock_rps_save_rxhash(struct sock *sk,
--
1.7.6.5
next reply other threads:[~2013-12-31 20:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-31 20:31 Zhi Yong Wu [this message]
2013-12-31 20:54 ` [net-next bugfix] net, rps: fix build failure when CONFIG_RPS isn't set David Miller
2013-12-31 20:58 ` David Miller
2014-01-01 6:36 ` Zhi Yong Wu
2013-12-31 22:03 ` Sergei Shtylyov
2013-12-31 21:08 ` David Miller
2013-12-31 21:08 ` David Miller
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=1388521861-17410-1-git-send-email-zwu.kernel@gmail.com \
--to=zwu.kernel@gmail.com \
--cc=davem@davemloft.net \
--cc=fengguang.wu@intel.com \
--cc=netdev@vger.kernel.org \
--cc=therbert@google.com \
--cc=wuzhy@linux.vnet.ibm.com \
/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;
as well as URLs for NNTP newsgroup(s).