| Message ID | 1328735457-29986-41-git-send-email-danny.kukawka@bisect.de |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wednesday 08 February 2012 22:10:47 Danny Kukawka 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/batman-adv/soft-interface.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/batman-adv/soft-interface.c > b/net/batman-adv/soft-interface.c index 987c75a..865a485 100644 > --- a/net/batman-adv/soft-interface.c > +++ b/net/batman-adv/soft-interface.c > @@ -541,6 +541,9 @@ static int interface_set_mac_addr(struct net_device > *dev, void *p) } > > memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); > + if (dev->addr_assign_type & NET_ADDR_RANDOM) > + dev->addr_assign_type ^= NET_ADDR_RANDOM; > + > return 0; > } Why not something like dev->addr_assign_type &= ~NET_ADDR_RANDOM; ? It is a relative common way inside the kernel to do this kind of stuff. Thanks, Sven PS: For the batman-adv people. This functionality was introduced with 2.6.36.
On Thursday, February 09, 2012 05:10:47 Danny Kukawka 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. Applied (with minor modification) in revision 910ccac. Thanks, Marek -- 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/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 987c75a..865a485 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -541,6 +541,9 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + if (dev->addr_assign_type & NET_ADDR_RANDOM) + dev->addr_assign_type ^= NET_ADDR_RANDOM; + return 0; } @@ -783,7 +786,6 @@ static const struct net_device_ops bat_netdev_ops = { static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@ -800,8 +802,7 @@ static void interface_setup(struct net_device *dev) dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + dev_hw_addr_random(dev, dev->dev_addr); SET_ETHTOOL_OPS(dev, &bat_ethtool_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/batman-adv/soft-interface.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)