summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-03-23 20:07:23 +0100
committerJeff Garzik <jeff@garzik.org>2006-03-23 23:13:54 +0100
commit901ccefb2dd7fe6a9e750a68f990f2a7d76b78d2 (patch)
tree993c53d43398941533ffc5b84457b33a4f23fee6 /drivers
parent[PATCH] sky2: dont need to use dev_kfree_skb_any (diff)
downloadlinux-901ccefb2dd7fe6a9e750a68f990f2a7d76b78d2.tar.xz
linux-901ccefb2dd7fe6a9e750a68f990f2a7d76b78d2.zip
[PATCH] skge: align receive buffers
The skge driver aligns the header on the initial receive buffers, but but doesn't on followon receive buffer allocations. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/skge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 4eda81d41b10..89a6252ac7cc 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2155,7 +2155,7 @@ static int skge_up(struct net_device *dev)
printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
if (dev->mtu > RX_BUF_SIZE)
- skge->rx_buf_size = dev->mtu + ETH_HLEN + NET_IP_ALIGN;
+ skge->rx_buf_size = dev->mtu + ETH_HLEN;
else
skge->rx_buf_size = RX_BUF_SIZE;
@@ -2611,6 +2611,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge,
if (!nskb)
goto resubmit;
+ skb_reserve(nskb, NET_IP_ALIGN);
pci_unmap_single(skge->hw->pdev,
pci_unmap_addr(e, mapaddr),
pci_unmap_len(e, maplen),