Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / drivers / staging / octeon / ethernet.c

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 1335283412e2d1cb951083d116b8ce8802f1d405..c3a90e7012afaddbfa5c0959d35d088de15ab562 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -453,12 +453,10 @@ int cvm_oct_common_init(struct net_device *dev)
        if (priv->of_node)
                mac = of_get_mac_address(priv->of_node);
 
-       if (mac && is_valid_ether_addr(mac)) {
+       if (mac && is_valid_ether_addr(mac))
                memcpy(dev->dev_addr, mac, ETH_ALEN);
-               dev->addr_assign_type &= ~NET_ADDR_RANDOM;
-       } else {
+       else
                eth_hw_addr_random(dev);
-       }
 
        /*
         * Force the interface to use the POW send if always_use_pow