diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-13 01:34:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 14:48:18 -0400 |
commit | 89d71a66c40d629e3b1285def543ab1425558cd5 (patch) | |
tree | 45159e85418170fe36e4e023d9617693625d1740 /drivers/net/3c59x.c | |
parent | bff1c09640b3006bca711e18ef08a5fb955ad9b5 (diff) |
net: Use netdev_alloc_skb_ip_align()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 975e25b19ebe..32031eaf4910 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -2560,7 +2560,7 @@ boomerang_rx(struct net_device *dev) | |||
2560 | struct sk_buff *skb; | 2560 | struct sk_buff *skb; |
2561 | entry = vp->dirty_rx % RX_RING_SIZE; | 2561 | entry = vp->dirty_rx % RX_RING_SIZE; |
2562 | if (vp->rx_skbuff[entry] == NULL) { | 2562 | if (vp->rx_skbuff[entry] == NULL) { |
2563 | skb = netdev_alloc_skb(dev, PKT_BUF_SZ + NET_IP_ALIGN); | 2563 | skb = netdev_alloc_skb_ip_align(dev, PKT_BUF_SZ); |
2564 | if (skb == NULL) { | 2564 | if (skb == NULL) { |
2565 | static unsigned long last_jif; | 2565 | static unsigned long last_jif; |
2566 | if (time_after(jiffies, last_jif + 10 * HZ)) { | 2566 | if (time_after(jiffies, last_jif + 10 * HZ)) { |
@@ -2572,7 +2572,6 @@ boomerang_rx(struct net_device *dev) | |||
2572 | break; /* Bad news! */ | 2572 | break; /* Bad news! */ |
2573 | } | 2573 | } |
2574 | 2574 | ||
2575 | skb_reserve(skb, NET_IP_ALIGN); | ||
2576 | vp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE)); | 2575 | vp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data, PKT_BUF_SZ, PCI_DMA_FROMDEVICE)); |
2577 | vp->rx_skbuff[entry] = skb; | 2576 | vp->rx_skbuff[entry] = skb; |
2578 | } | 2577 | } |