net, rps: fix build failure when CONFIG_RPS isn't set
authorZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Tue, 31 Dec 2013 20:31:01 +0000 (04:31 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Dec 2013 20:59:27 +0000 (15:59 -0500)
In file included from net/socket.c:99:0:
include/net/sock.h: In function ‘sock_rps_record_flow’:
include/net/sock.h:849:30: error: ‘const struct sock’ has no member named ‘sk_rxhash’
include/net/sock.h: In function ‘sock_rps_reset_flow’:
include/net/sock.h:854:29: error: ‘const struct sock’ has no member named ‘sk_rxhash’

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h

index 8ee90add69d2365fa52b5a30f6db8d99e4f6a770..bd716b6996ff315153642e53195c1337aa3c0f63 100644 (file)
@@ -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,