--- zzzz-none-000/linux-4.1.38/net/bridge/br.c	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/net/bridge/br.c	2020-11-25 10:06:48.000000000 +0000
@@ -77,7 +77,16 @@
 	case NETDEV_DOWN:
 		spin_lock_bh(&br->lock);
 		if (br->dev->flags & IFF_UP)
+#if defined(CONFIG_BCM_KF_BRIDGE_STP)
+		{
+			if (br->stp_enabled)
+				br_stp_off_port(p);
+			else
+				br_stp_disable_port(p);
+		}
+#else
 			br_stp_disable_port(p);
+#endif
 		spin_unlock_bh(&br->lock);
 		break;