The following commit has been merged in the next branch: commit 8e2c2d3e8bbc09020dd4ac7da5f922d79eca02f4 Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 12 14:35:29 2012 +0100

batman-adv: Remove useless branch for NET_ADDR_RANDOM

910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced a branch for a statement that doesn't need it.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/soft-interface.c b/soft-interface.c index 0087052..3750e9b 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -108,8 +108,7 @@ 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; + dev->addr_assign_type &= ~NET_ADDR_RANDOM;

return 0; }