--- zzzz-none-000/linux-2.6.13.1/net/bridge/br_device.c	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/net/bridge/br_device.c	2006-05-10 09:04:45.000000000 +0000
@@ -82,6 +82,30 @@
 	return 0;
 }
 
+static int br_set_mac_address(struct net_device *dev, void *addr_struct_p)
+{
+        struct net_bridge *br;
+        struct sockaddr *addr = (struct sockaddr *)(addr_struct_p);
+        unsigned char br_mac_zero[6] = {0,0,0,0,0,0};
+
+        br = dev->priv;
+        spin_lock_bh(&br->lock);
+
+        if (!memcmp(addr->sa_data, br_mac_zero, ETH_ALEN)) {
+                if (br->automatic_mac_disabled) {
+                        br->automatic_mac_disabled = 0;
+                        br_stp_recalculate_bridge_id(br);
+                }
+        } else {
+                br->automatic_mac_disabled = 1;
+                br_stp_set_bridge_id(br, addr->sa_data);
+        }
+        spin_unlock_bh(&br->lock);
+
+        return 0;
+}
+
+
 void br_dev_setup(struct net_device *dev)
 {
 	memset(dev->dev_addr, 0, ETH_ALEN);
@@ -98,6 +122,6 @@
 	SET_MODULE_OWNER(dev);
 	dev->stop = br_dev_stop;
 	dev->tx_queue_len = 0;
-	dev->set_mac_address = NULL;
+	dev->set_mac_address = br_set_mac_address; /* AVM */
 	dev->priv_flags = IFF_EBRIDGE;
 }