diff options
| author |   Daniel Borkmann <daniel@iogearbox.net> | 2020-03-29 21:59:02 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-03-30 01:16:50 +0200 |
| commit | 5a95cbb80ef8d8f2db29ab10777cd4742e6fc8ec (patch) | |
| tree | 26d05f20892a2d22c715366fa8d48aa6e4e78181 /include/net/net_namespace.h | |
| parent | Merge branch 'ifla_xdp_expected_fd' (diff) | |
| download | linux-dev-5a95cbb80ef8d8f2db29ab10777cd4742e6fc8ec.tar.xz linux-dev-5a95cbb80ef8d8f2db29ab10777cd4742e6fc8ec.zip | |
bpf, net: Fix build issue when net ns not configured
Fix a redefinition of 'net_gen_cookie' error that was overlooked
when net ns is not configured.
Fixes: f318903c0bf4 ("bpf: Add netns cookie and enable it for bpf cgroup hooks")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 1c6edfdb9a2c..ab96fb59131c 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -228,6 +228,8 @@ extern struct list_head net_namespace_list; struct net *get_net_ns_by_pid(pid_t pid); struct net *get_net_ns_by_fd(int fd); +u64 net_gen_cookie(struct net *net); + #ifdef CONFIG_SYSCTL void ipx_register_sysctl(void); void ipx_unregister_sysctl(void); @@ -276,8 +278,6 @@ static inline int check_net(const struct net *net) void net_drop_ns(void *); -u64 net_gen_cookie(struct net *net); - #else static inline struct net *get_net(struct net *net) @@ -305,11 +305,6 @@ static inline int check_net(const struct net *net) return 1; } -static inline u64 net_gen_cookie(struct net *net) -{ - return 0; -} - #define net_drop_ns NULL #endif |