diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-31 23:30:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-31 23:30:39 -0400 |
| commit | e11ec900cfbea3d8f6a188674ee6fcb65f2a73d6 (patch) | |
| tree | 55f5b27cdec71fdaa918b04d554b43fa16413f3f /drivers/net/ks8842.c | |
| parent | e12ca23d41bd157354a5d1aadff30211a410c53a (diff) | |
| parent | 948252cb9e01d65a89ecadf67be5018351eee15e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ks8842.c')
| -rw-r--r-- | drivers/net/ks8842.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c index 4d40626b3bfa..fc12ac0d9f2e 100644 --- a/drivers/net/ks8842.c +++ b/drivers/net/ks8842.c | |||
| @@ -661,7 +661,7 @@ static void ks8842_rx_frame(struct net_device *netdev, | |||
| 661 | 661 | ||
| 662 | /* check the status */ | 662 | /* check the status */ |
| 663 | if ((status & RXSR_VALID) && !(status & RXSR_ERROR)) { | 663 | if ((status & RXSR_VALID) && !(status & RXSR_ERROR)) { |
| 664 | struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len); | 664 | struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len + 3); |
| 665 | 665 | ||
| 666 | if (skb) { | 666 | if (skb) { |
| 667 | 667 | ||