--- zzzz-none-000/linux-4.1.38/include/uapi/linux/if_bridge.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/uapi/linux/if_bridge.h	2020-11-25 10:06:48.000000000 +0000
@@ -13,6 +13,12 @@
 #ifndef _UAPI_LINUX_IF_BRIDGE_H
 #define _UAPI_LINUX_IF_BRIDGE_H
 
+#if !defined(CONFIG_BCM_IN_KERNEL)
+#ifndef _LINUX_IF_BRIDGE_H
+#define _LINUX_IF_BRIDGE_H
+#endif
+#endif 
+
 #include <linux/types.h>
 #include <linux/if_ether.h>
 #include <linux/in6.h>
@@ -50,6 +56,9 @@
 #define BR_STATE_LEARNING 2
 #define BR_STATE_FORWARDING 3
 #define BR_STATE_BLOCKING 4
+#if defined(CONFIG_BCM_KF_BRIDGE_STP)
+#define BR_STATE_OFF 5
+#endif
 
 struct __bridge_info {
 	__u64 designated_root;
@@ -96,7 +105,11 @@
 	__u32 ageing_timer_value;
 	__u8 port_hi;
 	__u8 pad0;
+#if defined(CONFIG_BCM_KF_VLAN_AGGREGATION) && defined(CONFIG_BCM_VLAN_AGGREGATION)
+	__u16 vid;
+#else
 	__u16 unused;
+#endif
 };
 
 /* Bridge Flags */