summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-04-09 11:49:58 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:28:50 -0700
commitffe1d49cc300f3dff990093aa952a2fbb371c1b6 (patch)
tree2e23c0f31b0873ff93e3027d176604e9a0a25308
parentb86c45035c439cfa6ef5b2e4bf080b24bd8765f1 (diff)
downloadlinux-ffe1d49cc300f3dff990093aa952a2fbb371c1b6.tar.bz2
bridge: allow changing hardware address to any valid address
For case of bridging pseudo devices, the get created/destroyed (Xen) need to allow setting address to any valid value. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
-rw-r--r--net/bridge/br_device.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index b22ada529cc3..39b87dad35b7 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -83,27 +83,22 @@ 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
- */
+/* Allow setting mac address to any valid ethernet address. */
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;
+
+ if (!is_valid_ether_addr(addr->sa_data))
+ return -EINVAL;
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;
- }
- }
+ memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+ br_stp_change_bridge_id(br, addr->sa_data);
spin_unlock_bh(&br->lock);
- return err;
+ return 0;
}
static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)