--- zzzz-none-000/linux-4.19.183/include/net/net_namespace.h	2021-03-24 10:07:39.000000000 +0000
+++ bcm63-7530ax-756/linux-4.19.183/include/net/net_namespace.h	2023-06-28 08:54:20.000000000 +0000
@@ -19,6 +19,9 @@
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
 #include <net/netns/ipv6.h>
+#if defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)
+#include <net/netns/mptcp.h>
+#endif
 #include <net/netns/ieee802154_6lowpan.h>
 #include <net/netns/sctp.h>
 #include <net/netns/dccp.h>
@@ -44,6 +47,14 @@
 struct uevent_sock;
 struct netns_ipvs;
 
+/* Do not include avm_pa.h to avoid include cycle. Since we can't determine
+ * the size here we reserve some space, including some extra space for future
+ * extensions without having to rebuild the world.
+ *
+ * avm_pa contains a BUILD_BUG_ON() in case the reserve is too small.
+ */
+#define AVM_PA_DEV_INFO_NET_RESERVE 8
+struct avm_pa_dev_info;
 
 #define NETDEV_HASHBITS    8
 #define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS)
@@ -110,6 +121,11 @@
 #if IS_ENABLED(CONFIG_IPV6)
 	struct netns_ipv6	ipv6;
 #endif
+#if defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_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
@@ -159,6 +175,15 @@
 #if IS_ENABLED(CONFIG_CAN)
 	struct netns_can	can;
 #endif
+#if IS_ENABLED(CONFIG_AVM_PA)
+	u8				avm_pa[AVM_PA_DEV_INFO_NET_RESERVE * 2];
+#define AVM_PA_NET_IP_DEVINFO(net)	((struct avm_pa_dev_info *) &(net)->avm_pa[0])
+#define AVM_PA_NET_IP6_DEVINFO(net)	((struct avm_pa_dev_info *) (IS_ENABLED(CONFIG_IPV6) ? \
+		&(net)->avm_pa[AVM_PA_DEV_INFO_NET_RESERVE] : ((void)(net), NULL)))
+#else
+#define AVM_PA_NET_IP_DEVINFO(net)	((struct avm_pa_dev_info *) ((void)(net), NULL))
+#define AVM_PA_NET_IP6_DEVINFO(net)	((struct avm_pa_dev_info *) ((void)(net), NULL))
+#endif
 	struct sock		*diag_nlsk;
 	atomic_t		fnhe_genid;
 } __randomize_layout;