--- zzzz-none-000/linux-4.1.52/include/net/net_namespace.h 2018-05-28 02:26:45.000000000 +0000 +++ bcm63-7530ax-731/linux-4.1.52/include/net/net_namespace.h 2022-03-02 11:37:13.000000000 +0000 @@ -16,6 +16,9 @@ #include #include #include +#if defined(CONFIG_BCM_MPTCP) && defined(CONFIG_BCM_KF_MPTCP) +#include +#endif #include #include #include @@ -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 #include 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); @@ -217,7 +225,7 @@ return net; } -static inline void put_net(struct net *net) +static inline void put_net(struct net *net __maybe_unused) { } @@ -227,7 +235,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; } @@ -247,14 +256,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;