projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
[linux-2.6-microblaze.git]
/
include
/
net
/
net_namespace.h
diff --git
a/include/net/net_namespace.h
b/include/net/net_namespace.h
index
64bcb58
..
f8712bb
100644
(file)
--- a/
include/net/net_namespace.h
+++ b/
include/net/net_namespace.h
@@
-166,6
+166,9
@@
struct net {
#endif
#ifdef CONFIG_XDP_SOCKETS
struct netns_xdp xdp;
+#endif
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
+ struct sock *crypto_nlsk;
#endif
struct sock *diag_nlsk;
atomic_t fnhe_genid;