diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2006-10-03 16:39:12 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2006-10-05 06:43:23 -0400 |
| commit | 489b10c1f63fafcb89c330a0603694652068132a (patch) | |
| tree | d63a874a197e67c64c96137efd2cd55d1947eaa9 /drivers/net/sky2.c | |
| parent | Linux 2.6.19-rc1 (diff) | |
| download | linux-dev-489b10c1f63fafcb89c330a0603694652068132a.tar.xz linux-dev-489b10c1f63fafcb89c330a0603694652068132a.zip | |
[PATCH] sky2: incorrect length on receive packets
The previous change to do fragmented receive (post 2.6.18) introduced a bug
where packets are passed up with size set to the size of the receive buffer
not the actual received data. IP silently trims this so it didn't show up
right away.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 396e7df3c61b..68515150ff3b 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1907,7 +1907,7 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2, pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr, length, PCI_DMA_FROMDEVICE); re->skb->ip_summed = CHECKSUM_NONE; - __skb_put(skb, length); + skb_put(skb, length); } return skb; } @@ -1970,7 +1970,7 @@ static struct sk_buff *receive_new(struct sky2_port *sky2, if (skb_shinfo(skb)->nr_frags) skb_put_frags(skb, hdr_space, length); else - skb_put(skb, hdr_space); + skb_put(skb, length); return skb; } |