diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-06-04 13:09:01 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-06-04 13:09:01 +0200 |
| commit | af5666e0f76023d9c296016024297903a4c83108 (patch) | |
| tree | 9397e7a41dd3eb0c0e14a6407a8e8f12abed4fc5 /include/net/net_namespace.h | |
| parent | HID: core: fix validation of report id 0 (diff) | |
| parent | HID: core: add two new usages for digitizer (diff) | |
| download | linux-af5666e0f76023d9c296016024297903a4c83108.tar.xz linux-af5666e0f76023d9c296016024297903a4c83108.zip | |
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
Conflicts:
drivers/hid/hid-sensor-hub.c
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 991dcd94cbbf..79387f73f875 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -15,6 +15,7 @@ #include <net/netns/packet.h> #include <net/netns/ipv4.h> #include <net/netns/ipv6.h> +#include <net/netns/ieee802154_6lowpan.h> #include <net/netns/sctp.h> #include <net/netns/dccp.h> #include <net/netns/netfilter.h> @@ -90,6 +91,9 @@ struct net { #if IS_ENABLED(CONFIG_IPV6) struct netns_ipv6 ipv6; #endif +#if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN) + struct netns_ieee802154_lowpan ieee802154_lowpan; +#endif #if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE) struct netns_sctp sctp; #endif |