* [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() [not found] <1328735457-29986-1-git-send-email-danny.kukawka@bisect.de> @ 2012-02-08 21:10 ` Danny Kukawka 2012-02-09 8:44 ` Sven Eckelmann 2012-02-11 11:12 ` Marek Lindner 0 siblings, 2 replies; 3+ messages in thread From: Danny Kukawka @ 2012-02-08 21:10 UTC (permalink / raw) To: Marek Lindner Cc: netdev, b.a.t.m.a.n, Danny Kukawka, linux-kernel, Simon Wunderlich, David S. Miller 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; } @@ -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); -- 1.7.7.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() 2012-02-08 21:10 ` [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() Danny Kukawka @ 2012-02-09 8:44 ` Sven Eckelmann 2012-02-11 11:12 ` Marek Lindner 1 sibling, 0 replies; 3+ messages in thread From: Sven Eckelmann @ 2012-02-09 8:44 UTC (permalink / raw) To: b.a.t.m.a.n Cc: netdev, Danny Kukawka, linux-kernel, Simon Wunderlich, Danny Kukawka, Marek Lindner, David S. Miller [-- Attachment #1: Type: text/plain, Size: 1147 bytes --] 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. [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() 2012-02-08 21:10 ` [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() Danny Kukawka 2012-02-09 8:44 ` Sven Eckelmann @ 2012-02-11 11:12 ` Marek Lindner 1 sibling, 0 replies; 3+ messages in thread From: Marek Lindner @ 2012-02-11 11:12 UTC (permalink / raw) To: b.a.t.m.a.n Cc: netdev, Danny Kukawka, linux-kernel, Simon Wunderlich, Danny Kukawka, David S. Miller 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-11 11:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1328735457-29986-1-git-send-email-danny.kukawka@bisect.de>
2012-02-08 21:10 ` [B.A.T.M.A.N.] [PATCH 40/50] batman-adv: use dev_hw_addr_random() instead of random_ether_addr() Danny Kukawka
2012-02-09 8:44 ` Sven Eckelmann
2012-02-11 11:12 ` Marek Lindner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox