--- zzzz-none-000/linux-2.4.17/net/bridge/br_notify.c	2000-02-22 01:35:06.000000000 +0000
+++ sangam-fb-401/linux-2.4.17/net/bridge/br_notify.c	2005-10-04 11:51:35.000000000 +0000
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_notify.c,v 1.2 2000/02/21 15:51:34 davem Exp $
+ *	$Id: br_notify.c,v 1.1.1.1 2003/06/23 22:18:44 jharrell Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -42,7 +42,7 @@
 	case NETDEV_CHANGEADDR:
 		read_lock(&p->br->lock);
 		br_fdb_changeaddr(p, dev->dev_addr);
-		br_stp_recalculate_bridge_id(p->br);
+		if (!p->br->automatic_mac_disabled) br_stp_recalculate_bridge_id(p->br);
 		read_unlock(&p->br->lock);
 		break;