| Message ID | 1328735457-29986-48-git-send-email-danny.kukawka@bisect.de |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 8 Feb 2012 22:10:54 +0100 Danny Kukawka <danny.kukawka@bisect.de> wrote: > Use dev_hw_addr_random() instead of calling random_ether_addr() > to set addr_assign_type correctly to NET_ADDR_RANDOM. > > Reset the state to NET_ADDR_PERM as soon as the MAC get > changed via .ndo_set_mac_address. > > Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> > --- > net/bridge/br_device.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c > index 71773b0..a25ed22 100644 > --- a/net/bridge/br_device.c > +++ b/net/bridge/br_device.c > @@ -172,6 +172,10 @@ static int br_set_mac_address(struct net_device *dev, void *p) > spin_lock_bh(&br->lock); > if (compare_ether_addr(dev->dev_addr, addr->sa_data)) { > memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); > + if (dev->addr_assign_type & NET_ADDR_RANDOM) { > + /* set back to NET_ADDR_PERM */ > + dev->addr_assign_type ^= NET_ADDR_RANDOM; > + } > br_fdb_change_mac_address(br, addr->sa_data); > br_stp_change_bridge_id(br, addr->sa_data); > } > @@ -334,7 +338,7 @@ void br_dev_setup(struct net_device *dev) > { > struct net_bridge *br = netdev_priv(dev); > > - random_ether_addr(dev->dev_addr); > + dev_hw_addr_random(dev, dev->dev_addr); > ether_setup(dev); > > dev->netdev_ops = &br_netdev_ops; You should do more than just mechanical change here. Go ahead and eliminate the private (BR_SET_MAC_ADDR) flag as well, since it would be redundant. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 71773b0..a25ed22 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -172,6 +172,10 @@ static int br_set_mac_address(struct net_device *dev, void *p) spin_lock_bh(&br->lock); if (compare_ether_addr(dev->dev_addr, addr->sa_data)) { memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + if (dev->addr_assign_type & NET_ADDR_RANDOM) { + /* set back to NET_ADDR_PERM */ + dev->addr_assign_type ^= NET_ADDR_RANDOM; + } br_fdb_change_mac_address(br, addr->sa_data); br_stp_change_bridge_id(br, addr->sa_data); } @@ -334,7 +338,7 @@ void br_dev_setup(struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); - random_ether_addr(dev->dev_addr); + dev_hw_addr_random(dev, dev->dev_addr); ether_setup(dev); dev->netdev_ops = &br_netdev_ops;
Use dev_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> --- net/bridge/br_device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)