leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: sr: make seg6.h includable without IPv6

Browse Source 
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 <m.xhonneux@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Mathieu Xhonneux 2018-05-20 14:58:12 +01:00 committed by Daniel Borkmann
parent 30cfe3b4d0
commit 63526e1c80
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/seg6.h
View File

@ -49,7 +49,11 @@ struct seg6_pernet_data {
static inline struct seg6_pernet_data *seg6_pernet(struct net *net) static inline struct seg6_pernet_data *seg6_pernet(struct net *net)
{ {
#if IS_ENABLED(CONFIG_IPV6)
return net->ipv6.seg6_data; return net->ipv6.seg6_data;
#else
return NULL;
#endif
} }
extern int seg6_init(void); extern int seg6_init(void);