Re: [net-next bugfix] net, rps: fix build failure when CONFIG_RPS isn't set

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 12/31/2013 11:31 PM, Zhi Yong Wu wrote:

> 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
>   }

    A lot better style would be:

+#ifdef CONFIG_RPS
  static inline void sock_rps_reset_flow(const struct sock *sk)
  {
  	sock_rps_reset_flow_hash(sk->sk_rxhash);
  }
#else
  static inline void sock_rps_reset_flow(const struct sock *sk) {}
+#endif

WBR, Sergei