Commit 5a95cbb8 authored by Daniel Borkmann's avatar Daniel Borkmann

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: f318903c ("bpf: Add netns cookie and enable it for bpf cgroup hooks")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent ae661dec
...@@ -228,6 +228,8 @@ extern struct list_head net_namespace_list; ...@@ -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_pid(pid_t pid);
struct net *get_net_ns_by_fd(int fd); struct net *get_net_ns_by_fd(int fd);
u64 net_gen_cookie(struct net *net);
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
void ipx_register_sysctl(void); void ipx_register_sysctl(void);
void ipx_unregister_sysctl(void); void ipx_unregister_sysctl(void);
...@@ -276,8 +278,6 @@ static inline int check_net(const struct net *net) ...@@ -276,8 +278,6 @@ static inline int check_net(const struct net *net)
void net_drop_ns(void *); void net_drop_ns(void *);
u64 net_gen_cookie(struct net *net);
#else #else
static inline struct net *get_net(struct net *net) static inline struct net *get_net(struct net *net)
...@@ -305,11 +305,6 @@ static inline int check_net(const struct net *net) ...@@ -305,11 +305,6 @@ static inline int check_net(const struct net *net)
return 1; return 1;
} }
static inline u64 net_gen_cookie(struct net *net)
{
return 0;
}
#define net_drop_ns NULL #define net_drop_ns NULL
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment