lkml.org 
[lkml]   [2012]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 47/50] bridge: use dev_hw_addr_random() instead of random_ether_addr()
    Date
    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;
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-02-08 22:21    [W:4.065 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site