--- zzzz-none-000/linux-2.6.13.1/net/bridge/br_notify.c	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/net/bridge/br_notify.c	2006-05-10 09:04:45.000000000 +0000
@@ -49,11 +49,11 @@
 
 	case NETDEV_CHANGEADDR:
 		br_fdb_changeaddr(p, dev->dev_addr);
-		br_stp_recalculate_bridge_id(br);
+		 if (!p->br->automatic_mac_disabled) br_stp_recalculate_bridge_id(br);
 		break;
 
 	case NETDEV_CHANGE:	/* device is up but carrier changed */
-		if (!(br->dev->flags & IFF_UP))
+			if (!(br->dev->flags & IFF_UP))
 			break;
 
 		if (netif_carrier_ok(dev)) {