git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Use netdev_alloc_skb_ip_align()
[safe/jmp/linux-2.6]
/
drivers
/
net
/
igbvf
/
netdev.c
diff --git
a/drivers/net/igbvf/netdev.c
b/drivers/net/igbvf/netdev.c
index
91024a3
..
fad7f34
100644
(file)
--- a/
drivers/net/igbvf/netdev.c
+++ b/
drivers/net/igbvf/netdev.c
@@
-170,18
+170,12
@@
static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
}
if (!buffer_info->skb) {
}
if (!buffer_info->skb) {
- skb = netdev_alloc_skb
(netdev, bufsz + NET_IP_ALIGN
);
+ skb = netdev_alloc_skb
_ip_align(netdev, bufsz
);
if (!skb) {
adapter->alloc_rx_buff_failed++;
goto no_buffers;
}
if (!skb) {
adapter->alloc_rx_buff_failed++;
goto no_buffers;
}
- /* Make buffer alignment 2 beyond a 16 byte boundary
- * this will result in a 16 byte aligned IP header after
- * the 14 byte MAC header is removed
- */
- skb_reserve(skb, NET_IP_ALIGN);
-
buffer_info->skb = skb;
buffer_info->dma = pci_map_single(pdev, skb->data,
bufsz,
buffer_info->skb = skb;
buffer_info->dma = pci_map_single(pdev, skb->data,
bufsz,