net: use eth_hw_addr_random() and reset addr_assign_type

[deliverable/linux.git] / drivers / net / ethernet / tile / tilepro.c

diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index d9951afb9269ff130310dc912293f39d3808c666..948c4f2a2d676a332bd78e4f41cbd1f433083bb4 100644 (file)
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -419,7 +419,7 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
 #endif
 
        /* Avoid "false sharing" with last cache line. */
-       /* ISSUE: This is already done by "dev_alloc_skb()". */
+       /* ISSUE: This is already done by "netdev_alloc_skb()". */
        unsigned int len =
                 (((small ? LIPP_SMALL_PACKET_SIZE : large_size) +
                   CHIP_L2_LINE_SIZE() - 1) & -CHIP_L2_LINE_SIZE());
@@ -433,7 +433,7 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
        struct sk_buff **skb_ptr;
 
        /* Request 96 extra bytes for alignment purposes. */
-       skb = dev_alloc_skb(len + padding);
+       skb = netdev_alloc_skb(info->napi->dev, len + padding);
        if (skb == NULL)
                return false;
 
@@ -2190,6 +2190,7 @@ static int tile_net_set_mac_address(struct net_device *dev, void *p)
 
        /* ISSUE: Note that "dev_addr" is now a pointer. */
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+       dev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
        return 0;
 }
@@ -2254,7 +2255,7 @@ static int tile_net_get_mac(struct net_device *dev)
                 * can't get its MAC address, we are most likely running
                 * the simulator, so let's generate a random MAC address.
                 */
-               random_ether_addr(dev->dev_addr);
+               eth_hw_addr_random(dev);
        }
 
        return 0;