diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-04-12 10:45:11 +0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-04-12 10:45:11 +0400 |
| commit | d968370ee7ce22583ab741961f0044d2922aa1a1 (patch) | |
| tree | 4c5375d7893d50eb6b5b17a1e0243c3b6469aefe /drivers/net/ethernet/cirrus/ep93xx_eth.c | |
| parent | d97c121bb23d32ef631c553d2656f8ccf8349507 (diff) | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| download | linux-d968370ee7ce22583ab741961f0044d2922aa1a1.tar.xz | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Diffstat (limited to 'drivers/net/ethernet/cirrus/ep93xx_eth.c')
| -rw-r--r-- | drivers/net/ethernet/cirrus/ep93xx_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c index 4317af8d2f0a..78c55213eaf7 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -282,7 +282,7 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget) if (rstat0 & RSTAT0_CRCI) length -= 4; - skb = dev_alloc_skb(length + 2); + skb = netdev_alloc_skb(dev, length + 2); if (likely(skb != NULL)) { struct ep93xx_rdesc *rxd = &ep->descs->rdesc[entry]; skb_reserve(skb, 2); @@ -859,7 +859,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev) ep->mdc_divisor = 40; /* Max HCLK 100 MHz, min MDIO clk 2.5 MHz. */ if (is_zero_ether_addr(dev->dev_addr)) - random_ether_addr(dev->dev_addr); + eth_hw_addr_random(dev); err = register_netdev(dev); if (err) { |