aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-04-30 01:49:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-21 12:39:59 -0400
commitec2b1ddb8f9c4efd78f4bd0d832ab4a35eed4659 (patch)
tree05ec9dd3d27e4706566fde0ce4106e8218b44941
parentff422223cc56542d31575afd05b02bd1493abf4b (diff)
sky2: propogate rx hash when packet is copied
[ Upstream commit 3f42941b5d1d13542b1a755a9e4f633aa72e4d3e ] When a small packet is received, the driver copies it to a new skb to allow reusing the full size Rx buffer. The copy was propogating the checksum offload but not the receive hash information. The bug is impact was mostly harmless and therefore not observed until reviewing this area of code. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/sky2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 80df3a833e5..88e287fd072 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2344,8 +2344,11 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2,
2344 skb_copy_from_linear_data(re->skb, skb->data, length); 2344 skb_copy_from_linear_data(re->skb, skb->data, length);
2345 skb->ip_summed = re->skb->ip_summed; 2345 skb->ip_summed = re->skb->ip_summed;
2346 skb->csum = re->skb->csum; 2346 skb->csum = re->skb->csum;
2347 skb->rxhash = re->skb->rxhash;
2348
2347 pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr, 2349 pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr,
2348 length, PCI_DMA_FROMDEVICE); 2350 length, PCI_DMA_FROMDEVICE);
2351 re->skb->rxhash = 0;
2349 re->skb->ip_summed = CHECKSUM_NONE; 2352 re->skb->ip_summed = CHECKSUM_NONE;
2350 skb_put(skb, length); 2353 skb_put(skb, length);
2351 } 2354 }