---

yaml --- r: 369210 b: refs/heads/master c: 09bf1c1 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 33a78fb · 33a78fb
1 parent fb55b3e
commit 33a78fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0317998c340203204ee7622d75a59f41ac13bc6
+refs/heads/master: 09bf1c1072a94468760f7e2bf945512d53522b07
diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -604,7 +604,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
 			lro_receive_skb(&rxq->lro_mgr, skb, (void *)cmd_sts);
 			lro_flush_needed = 1;
 		} else
-			netif_receive_skb(skb);
+			napi_gro_receive(&mp->napi, skb);
 
 		continue;