From 33a78fb60a60bc1be30e508ba6931837972417a7 Mon Sep 17 00:00:00 2001
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: Thu, 11 Apr 2013 02:40:23 +0000
Subject: [PATCH] --- yaml --- r: 369210 b: refs/heads/master c:
 09bf1c1072a94468760f7e2bf945512d53522b07 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 928439191b5b..862b6f90d21e 100644
--- 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
index 305038f48176..c850d0475c28 100644
--- 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;