--- zzzz-none-000/linux-2.4.17/net/bridge/br_stp_if.c	2001-04-19 15:38:50.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/net/bridge/br_stp_if.c	2004-11-24 13:22:09.000000000 +0000
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_stp_if.c,v 1.4 2001/04/14 21:14:39 davem Exp $
+ *	$Id: br_stp_if.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
@@ -162,6 +162,16 @@
 
 	p = br->port_list;
 	while (p != NULL) {
+
+	  if(br->stp_enabled == 1)
+	    goto original;
+
+	  if(strcmp(p->dev->name, "eth0") == 0) {
+	    addr =  p->dev->dev_addr;
+	    break;
+	  }
+
+	original:
 		if (addr == br_mac_zero ||
 		    memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
 			addr = p->dev->dev_addr;