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/atl1e | |
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/atl1e')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 955da733c2ad..8b889ab544b0 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -1433,14 +1433,12 @@ static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que, | |||
1433 | 1433 | ||
1434 | packet_size = ((prrs->word1 >> RRS_PKT_SIZE_SHIFT) & | 1434 | packet_size = ((prrs->word1 >> RRS_PKT_SIZE_SHIFT) & |
1435 | RRS_PKT_SIZE_MASK) - 4; /* CRC */ | 1435 | RRS_PKT_SIZE_MASK) - 4; /* CRC */ |
1436 | skb = netdev_alloc_skb(netdev, | 1436 | skb = netdev_alloc_skb_ip_align(netdev, packet_size); |
1437 | packet_size + NET_IP_ALIGN); | ||
1438 | if (skb == NULL) { | 1437 | if (skb == NULL) { |
1439 | dev_warn(&pdev->dev, "%s: Memory squeeze," | 1438 | dev_warn(&pdev->dev, "%s: Memory squeeze," |
1440 | "deferring packet.\n", netdev->name); | 1439 | "deferring packet.\n", netdev->name); |
1441 | goto skip_pkt; | 1440 | goto skip_pkt; |
1442 | } | 1441 | } |
1443 | skb_reserve(skb, NET_IP_ALIGN); | ||
1444 | skb->dev = netdev; | 1442 | skb->dev = netdev; |
1445 | memcpy(skb->data, (u8 *)(prrs + 1), packet_size); | 1443 | memcpy(skb->data, (u8 *)(prrs + 1), packet_size); |
1446 | skb_put(skb, packet_size); | 1444 | skb_put(skb, packet_size); |