A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-05 19:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPSTREAM: bpf, net: Fix build issue when net ns not configured

Browse source 
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>
Change-Id: Icec4b9f3709553111048d3389f6cd28e8e05f68e
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Daniel Borkmann 2020-03-29 21:59:02 +02:00 • committed by basamaryan
commit 92074107e8
No known key found for this signature in database
GPG key ID: 210D5384FB2A5885
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/net/net_namespace.h
View file

@ -237,6 +237,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);
@ -285,8 +287,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)
@ -314,11 +314,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