diff options
Diffstat (limited to 'drivers/net/ethoc.c')
-rw-r--r-- | drivers/net/ethoc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index f7d9ac8324cb..bd1db92aec1b 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
@@ -406,10 +406,10 @@ static int ethoc_rx(struct net_device *dev, int limit) | |||
406 | 406 | ||
407 | if (ethoc_update_rx_stats(priv, &bd) == 0) { | 407 | if (ethoc_update_rx_stats(priv, &bd) == 0) { |
408 | int size = bd.stat >> 16; | 408 | int size = bd.stat >> 16; |
409 | struct sk_buff *skb = netdev_alloc_skb(dev, size); | 409 | struct sk_buff *skb; |
410 | 410 | ||
411 | size -= 4; /* strip the CRC */ | 411 | size -= 4; /* strip the CRC */ |
412 | skb_reserve(skb, 2); /* align TCP/IP header */ | 412 | skb = netdev_alloc_skb_ip_align(dev, size); |
413 | 413 | ||
414 | if (likely(skb)) { | 414 | if (likely(skb)) { |
415 | void *src = phys_to_virt(bd.addr); | 415 | void *src = phys_to_virt(bd.addr); |
@@ -641,7 +641,7 @@ static int ethoc_mdio_probe(struct net_device *dev) | |||
641 | return -ENXIO; | 641 | return -ENXIO; |
642 | } | 642 | } |
643 | 643 | ||
644 | phy = phy_connect(dev, dev_name(&phy->dev), ðoc_mdio_poll, 0, | 644 | phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0, |
645 | PHY_INTERFACE_MODE_GMII); | 645 | PHY_INTERFACE_MODE_GMII); |
646 | if (IS_ERR(phy)) { | 646 | if (IS_ERR(phy)) { |
647 | dev_err(&dev->dev, "could not attach to PHY\n"); | 647 | dev_err(&dev->dev, "could not attach to PHY\n"); |