From 91a4df2b55c2def589497e6f71cfffbfa4042aaf Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 22 Aug 2012 21:28:19 +0000 Subject: [PATCH] --- yaml --- r: 327618 b: refs/heads/master c: d68bb7e1a65f2604156958ae03a556b6a207514b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/wiznet/w5100.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97445d326d51..6d6f0dc58074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9213bb8325747d00b6d9d5aea6ccde6a72c8a1fa +refs/heads/master: d68bb7e1a65f2604156958ae03a556b6a207514b diff --git a/trunk/drivers/net/ethernet/wiznet/w5100.c b/trunk/drivers/net/ethernet/wiznet/w5100.c index a5826a3111a6..2c08bf6e7bf3 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5100.c +++ b/trunk/drivers/net/ethernet/wiznet/w5100.c @@ -637,8 +637,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev) if (data && is_valid_ether_addr(data->mac_addr)) { memcpy(ndev->dev_addr, data->mac_addr, ETH_ALEN); } else { - eth_random_addr(ndev->dev_addr); - ndev->addr_assign_type |= NET_ADDR_RANDOM; + eth_hw_addr_random(ndev); } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);