From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Xhonneux Subject: [PATCH bpf-next v3 1/6] ipv6: sr: make seg6.h includable without IPv6 Date: Sun, 6 May 2018 18:27:29 +0100 Message-ID: <2618386edb37bfbe7200df4e70ca8434d2584e60.1525626429.git.m.xhonneux@gmail.com> References: Cc: dlebrun@google.com, alexei.starovoitov@gmail.com To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:40487 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbeEFP1j (ORCPT ); Sun, 6 May 2018 11:27:39 -0400 Received: by mail-wm0-f65.google.com with SMTP id j5-v6so12068310wme.5 for ; Sun, 06 May 2018 08:27:38 -0700 (PDT) In-Reply-To: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org List-ID: include/net/seg6.h cannot be included in a source file if CONFIG_IPV6 is not enabled: include/net/seg6.h: In function 'seg6_pernet': >> include/net/seg6.h:52:14: error: 'struct net' has no member named 'ipv6'; did you mean 'ipv4'? return net->ipv6.seg6_data; ^~~~ ipv4 This commit makes seg6_pernet return NULL if IPv6 is not compiled, hence allowing seg6.h to be included regardless of the configuration. Signed-off-by: Mathieu Xhonneux --- include/net/seg6.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/net/seg6.h b/include/net/seg6.h index 099bad59dc90..70b4cfac52d7 100644 --- a/include/net/seg6.h +++ b/include/net/seg6.h @@ -49,7 +49,11 @@ struct seg6_pernet_data { static inline struct seg6_pernet_data *seg6_pernet(struct net *net) { +#if IS_ENABLED(CONFIG_IPV6) return net->ipv6.seg6_data; +#else + return NULL; +#endif } extern int seg6_init(void); -- 2.16.1