diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2012-04-30 05:49:45 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-20 22:56:35 +0100 |
| commit | d035ead85c6b765d5138a3a2cd8290e8966c74d5 (patch) | |
| tree | 049e9136177cb0cb35562cfcd944ac69d5469922 | |
| parent | 7b9c691febb4325f17a793fce9f86a1e90e37283 (diff) | |
| download | linux-stable-d035ead85c6b765d5138a3a2cd8290e8966c74d5.tar.gz linux-stable-d035ead85c6b765d5138a3a2cd8290e8966c74d5.tar.bz2 linux-stable-d035ead85c6b765d5138a3a2cd8290e8966c74d5.zip | |
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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 7eb8a0023166..e1f4b659b238 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -2475,8 +2475,11 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2, skb_copy_from_linear_data(re->skb, skb->data, length); skb->ip_summed = re->skb->ip_summed; skb->csum = re->skb->csum; + skb->rxhash = re->skb->rxhash; + pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr, length, PCI_DMA_FROMDEVICE); + re->skb->rxhash = 0; re->skb->ip_summed = CHECKSUM_NONE; skb_put(skb, length); } |