aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-03-23 14:07:23 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-23 17:13:54 -0500
commit901ccefb2dd7fe6a9e750a68f990f2a7d76b78d2 (patch)
tree993c53d43398941533ffc5b84457b33a4f23fee6
parent15240072ac3ffb67050acd0b71b477c3bb977670 (diff)
[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>
-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)
2155 printk(KERN_INFO PFX "%s: enabling interface\n", dev->name); 2155 printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
2156 2156
2157 if (dev->mtu > RX_BUF_SIZE) 2157 if (dev->mtu > RX_BUF_SIZE)
2158 skge->rx_buf_size = dev->mtu + ETH_HLEN + NET_IP_ALIGN; 2158 skge->rx_buf_size = dev->mtu + ETH_HLEN;
2159 else 2159 else
2160 skge->rx_buf_size = RX_BUF_SIZE; 2160 skge->rx_buf_size = RX_BUF_SIZE;
2161 2161
@@ -2611,6 +2611,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge,
2611 if (!nskb) 2611 if (!nskb)
2612 goto resubmit; 2612 goto resubmit;
2613 2613
2614 skb_reserve(nskb, NET_IP_ALIGN);
2614 pci_unmap_single(skge->hw->pdev, 2615 pci_unmap_single(skge->hw->pdev,
2615 pci_unmap_addr(e, mapaddr), 2616 pci_unmap_addr(e, mapaddr),
2616 pci_unmap_len(e, maplen), 2617 pci_unmap_len(e, maplen),