| From | Danny Kukawka <> | Subject | [PATCH 01/50] eth: reset addr_assign_type if eth_mac_addr() called | Date | Wed, 8 Feb 2012 22:10:08 +0100 |
| |
If eth_mac_addr() get called, usually if SIOCSIFHWADDR was used to change the MAC of a ethernet device, reset the addr_assign_type to NET_ADDR_PERM if the state was NET_ADDR_RANDOM before. Reset the state since the MAC is no longer random at least not from the kernel side.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> --- net/ethernet/eth.c | 4 ++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index a246836..9d68142 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -288,6 +288,10 @@ int eth_mac_addr(struct net_device *dev, void *p) if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + /* if device marked as NET_ADDR_RANDOM, reset it */ + if (dev->addr_assign_type & NET_ADDR_RANDOM) + dev->addr_assign_type ^= NET_ADDR_RANDOM; + return 0; } EXPORT_SYMBOL(eth_mac_addr); -- 1.7.7.3
|