---

yaml --- r: 299977 b: refs/heads/master c: 3f42941 h: refs/heads/master i: 299975: 269a49b v: v3
git-mirror · May 1, 2012 · 2d2304e · 2d2304e
1 parent 9a1ab05
commit 2d2304e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d961949660fa1c1b7eb0c3a3c157989c90f14e8e
+refs/heads/master: 3f42941b5d1d13542b1a755a9e4f633aa72e4d3e
diff --git a/trunk/drivers/net/ethernet/marvell/sky2.c b/trunk/drivers/net/ethernet/marvell/sky2.c
@@ -2494,8 +2494,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);
 	}