--- zzzz-none-000/linux-4.1.38/include/uapi/linux/if.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/uapi/linux/if.h	2020-11-25 10:06:48.000000000 +0000
@@ -21,9 +21,21 @@
 
 #include <linux/types.h>		/* for "__kernel_caddr_t" et al	*/
 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
+#if !defined(CONFIG_BCM_IN_KERNEL)
+//userspace already has __user defined....
+#else
 #include <linux/compiler.h>		/* for "__user" et al           */
+#endif
 
+/* nsc@avm: gently define IFNAMSIZ is not yet done; check for consistency */
+#ifdef IFNAMSIZ
+# if IFNAMSIZ != 16
+#  error IFNAMSIZ has been defined != 16
+# endif
+#else
 #define	IFNAMSIZ	16
+#endif
+
 #define	IFALIASZ	256
 #include <linux/hdlc/ioctl.h>
 
@@ -109,6 +121,11 @@
 #define IFF_DORMANT			IFF_DORMANT
 #define IFF_ECHO			IFF_ECHO
 
+#if defined(CONFIG_BCM_MPTCP) && defined(CONFIG_BCM_KF_MPTCP)
+#define IFF_NOMULTIPATH	0x80000		/* Disable for MPTCP 		*/
+#define IFF_MPBACKUP	0x100000	/* Use as backup path for MPTCP */
+
+#endif
 #define IFF_VOLATILE	(IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
 		IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)