diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2010-12-25 07:39:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-25 19:37:49 -0800 |
| commit | 7a36df8a857edee8cd8967cbe99a85574d22f482 (patch) | |
| tree | f0db8b481d9f721be896af6b8c3bdb0448778b4a /drivers/net/hamachi.c | |
| parent | 78a36f25478432835f2f1e46202b71ff3ae454ff (diff) | |
| download | linux-7a36df8a857edee8cd8967cbe99a85574d22f482.tar.gz linux-7a36df8a857edee8cd8967cbe99a85574d22f482.tar.bz2 linux-7a36df8a857edee8cd8967cbe99a85574d22f482.zip | |
epic100: hamachi: yellowfin: Fix skb allocation size
Joel Soete reported oopses during pppoe over sundance NIC, caused by
a bug in skb allocation and dma mapping code, where skb_reserve()
bytes weren't taken into account. As a followup to the patch:
"sundance: Fix oopses with corrupted skb_shared_info" very similar
code is fixed here for three other drivers.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Cc: Joel Soete <soete.joel@scarlet.be>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 9a6485892b3d..80d25ed53344 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -1202,7 +1202,7 @@ static void hamachi_init_ring(struct net_device *dev) } /* Fill in the Rx buffers. Handle allocation failure gracefully. */ for (i = 0; i < RX_RING_SIZE; i++) { - struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz); + struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz + 2); hmp->rx_skbuff[i] = skb; if (skb == NULL) break; @@ -1669,7 +1669,7 @@ static int hamachi_rx(struct net_device *dev) entry = hmp->dirty_rx % RX_RING_SIZE; desc = &(hmp->rx_ring[entry]); if (hmp->rx_skbuff[entry] == NULL) { - struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz); + struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz + 2); hmp->rx_skbuff[entry] = skb; if (skb == NULL) |