--- zzzz-none-000/linux-4.1.38/include/net/net_namespace.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/net/net_namespace.h	2020-11-25 10:06:48.000000000 +0000
@@ -16,6 +16,9 @@
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
 #include <net/netns/ipv6.h>
+#if defined(CONFIG_BCM_MPTCP) && defined(CONFIG_BCM_KF_MPTCP)
+#include <net/netns/mptcp.h>
+#endif
 #include <net/netns/ieee802154_6lowpan.h>
 #include <net/netns/sctp.h>
 #include <net/netns/dccp.h>
@@ -92,6 +95,11 @@
 #if IS_ENABLED(CONFIG_IPV6)
 	struct netns_ipv6	ipv6;
 #endif
+#if defined(CONFIG_BCM_MPTCP) && defined(CONFIG_BCM_KF_MPTCP)
+#if IS_ENABLED(CONFIG_MPTCP)
+	struct netns_mptcp	mptcp;
+#endif
+#endif
 #if IS_ENABLED(CONFIG_IEEE802154_6LOWPAN)
 	struct netns_ieee802154_lowpan	ieee802154_lowpan;
 #endif
@@ -148,7 +156,7 @@
 #include <linux/sched.h>
 #include <linux/nsproxy.h>
 static inline struct net *copy_net_ns(unsigned long flags,
-	struct user_namespace *user_ns, struct net *old_net)
+	struct user_namespace *user_ns __maybe_unused, struct net *old_net)
 {
 	if (flags & CLONE_NEWNET)
 		return ERR_PTR(-EINVAL);
@@ -212,7 +220,7 @@
 	return net;
 }
 
-static inline void put_net(struct net *net)
+static inline void put_net(struct net *net __maybe_unused)
 {
 }
 
@@ -222,7 +230,8 @@
 }
 
 static inline
-int net_eq(const struct net *net1, const struct net *net2)
+int net_eq(const struct net *net1 __maybe_unused,
+	   const struct net *net2 __maybe_unused)
 {
 	return 1;
 }
@@ -237,14 +246,14 @@
 #endif
 } possible_net_t;
 
-static inline void write_pnet(possible_net_t *pnet, struct net *net)
+static inline void write_pnet(possible_net_t *pnet __maybe_unused, struct net *net __maybe_unused)
 {
 #ifdef CONFIG_NET_NS
 	pnet->net = net;
 #endif
 }
 
-static inline struct net *read_pnet(const possible_net_t *pnet)
+static inline struct net *read_pnet(const possible_net_t *pnet __maybe_unused)
 {
 #ifdef CONFIG_NET_NS
 	return pnet->net;