git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
s2io.c
diff --git
a/drivers/net/s2io.c
b/drivers/net/s2io.c
index
14dc145
..
c4bd179
100644
(file)
--- a/
drivers/net/s2io.c
+++ b/
drivers/net/s2io.c
@@
-1425,13
+1425,13
@@
int fill_rx_buffers(struct s2io_nic *nic, int ring_no)
goto end;
}
goto end;
}
- skb = dev_alloc_skb(size +
HEADER_ALIGN_LAYER_3
);
+ skb = dev_alloc_skb(size +
NET_IP_ALIGN
);
if (!skb) {
DBG_PRINT(ERR_DBG, "%s: Out of ", dev->name);
DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n");
return -ENOMEM;
}
if (!skb) {
DBG_PRINT(ERR_DBG, "%s: Out of ", dev->name);
DBG_PRINT(ERR_DBG, "memory to allocate SKBs\n");
return -ENOMEM;
}
- skb_reserve(skb,
HEADER_ALIGN_LAYER_3
);
+ skb_reserve(skb,
NET_IP_ALIGN
);
memset(rxdp, 0, sizeof(RxD_t));
rxdp->Buffer0_ptr = pci_map_single
(nic->pdev, skb->data, size, PCI_DMA_FROMDEVICE);
memset(rxdp, 0, sizeof(RxD_t));
rxdp->Buffer0_ptr = pci_map_single
(nic->pdev, skb->data, size, PCI_DMA_FROMDEVICE);