3 files changed, 28 insertions, 4 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f564ee99782d..f7a66abf5def 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -15,7 +15,8 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
-#include <linux/module.h>
+#include <linux/etherdevice.h>
+
 #include <asm/uaccess.h>
 #include "br_private.h"
 
@@ -82,6 +83,29 @@ static int br_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+/* Allow setting mac address of pseudo-bridge to be same as
+ * any of the bound interfaces
+ */
+static int br_set_mac_address(struct net_device *dev, void *p)
+{
+        struct net_bridge *br = netdev_priv(dev);
+        struct sockaddr *addr = p;
+        struct net_bridge_port *port;
+        int err = -EADDRNOTAVAIL;
+
+        spin_lock_bh(&br->lock);
+        list_for_each_entry(port, &br->port_list, list) {
+                if (!compare_ether_addr(port->dev->dev_addr, addr->sa_data)) {
+                        br_stp_change_bridge_id(br, addr->sa_data);
+                        err = 0;
+                        break;
+                }
+        }
+        spin_unlock_bh(&br->lock);
+
+        return err;
+}
+
 void br_dev_setup(struct net_device *dev)
 {
         memset(dev->dev_addr, 0, ETH_ALEN);
@@ -98,6 +122,6 @@ void br_dev_setup(struct net_device *dev)
         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;
         dev->priv_flags = IFF_EBRIDGE;
 }
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index bdf95a74d8cd..2c249486476f 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -201,6 +201,7 @@ extern void br_stp_disable_bridge(struct net_bridge *br);
 extern void br_stp_enable_port(struct net_bridge_port *p);
 extern void br_stp_disable_port(struct net_bridge_port *p);
 extern void br_stp_recalculate_bridge_id(struct net_bridge *br);
+extern void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *a);
 extern void br_stp_set_bridge_priority(struct net_bridge *br,
                                        u16 newprio);
 extern void br_stp_set_port_priority(struct net_bridge_port *p,
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index ac09b6a23523..2d2e969ae25d 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -120,8 +120,7 @@ void br_stp_disable_port(struct net_bridge_port *p)
 }
 
 /* called under bridge lock */
-static void br_stp_change_bridge_id(struct net_bridge *br, 
-                                    const unsigned char *addr)
+void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)
 {
         unsigned char oldaddr[6];
         struct net_bridge_port *p;