From 3eac2cba0f1658e5209cc310697070258f8dbdfb Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 22 Aug 2012 21:28:40 +0000 Subject: [PATCH] --- yaml --- r: 327619 b: refs/heads/master c: 1f7c9ae7a014d994c01a7dd59333f2fcef2aba58 h: refs/heads/master i: 327617: 0899add3446bb926b6402416dc186e9ed963a216 327615: 188fe701a49b852a6999cec4a2782c69955e65ba v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/wiznet/w5300.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6d6f0dc58074..b1f25e1dfc52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d68bb7e1a65f2604156958ae03a556b6a207514b +refs/heads/master: 1f7c9ae7a014d994c01a7dd59333f2fcef2aba58 diff --git a/trunk/drivers/net/ethernet/wiznet/w5300.c b/trunk/drivers/net/ethernet/wiznet/w5300.c index bdd8891c215a..88943d90c765 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5300.c +++ b/trunk/drivers/net/ethernet/wiznet/w5300.c @@ -557,8 +557,7 @@ static int __devinit w5300_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);