summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mipsnet.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-04-07 03:48:59 +0200
committerLen Brown <len.brown@intel.com>2012-04-07 03:48:59 +0200
commiteeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch)
tree369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/net/ethernet/mipsnet.c
parentcpuidle: Fix panic in CPU off-lining with no idle driver (diff)
parentMAINTAINERS: Update git url for ACPI (diff)
downloadlinux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.tar.xz
linux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.zip
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/net/ethernet/mipsnet.c')
-rw-r--r--drivers/net/ethernet/mipsnet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mipsnet.c b/drivers/net/ethernet/mipsnet.c
index d05b0c9e1e9c..db5285befe2a 100644
--- a/drivers/net/ethernet/mipsnet.c
+++ b/drivers/net/ethernet/mipsnet.c
@@ -152,7 +152,7 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t len)
if (!len)
return len;
- skb = dev_alloc_skb(len + NET_IP_ALIGN);
+ skb = netdev_alloc_skb(dev, len + NET_IP_ALIGN);
if (!skb) {
dev->stats.rx_dropped++;
return -ENOMEM;
@@ -281,7 +281,7 @@ static int __devinit mipsnet_probe(struct platform_device *dev)
* Lacking any better mechanism to allocate a MAC address we use a
* random one ...
*/
- random_ether_addr(netdev->dev_addr);
+ eth_hw_addr_random(netdev);
err = register_netdev(netdev);
if (err) {