From 8879f714bdd525f2e45846cc9b4fdeed073638d2 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 15 Dec 2008 23:46:15 -0800
Subject: [PATCH] --- yaml --- r: 122719 b: refs/heads/master c:
 89c88b16f12e9df9ac39418638f267ec3b36a6c6 h: refs/heads/master i:   122717:
 2e76a6d900c3dcabf1d02126d12ce1f04ac44667   122715:
 20d921eb70162a37f5ab66a83cb2698ec4e1597b   122711:
 e55a4b2f75a50f2edf86b19c94e9fc802629cabe   122703:
 f7d2d143c77764ba97f0927e92ecb9d121258a74   122687:
 d5475938321ce38e3a8f1d7bb2e66426d937d30f v: v3

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

diff --git a/[refs] b/[refs]
index a5770bb6e28c..099f122ecec4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b240a0e5644eb817c4a397098a40e1ad42a615bc
+refs/heads/master: 89c88b16f12e9df9ac39418638f267ec3b36a6c6
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index a4278bbf560c..f7b05609073d 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -102,7 +102,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
 		vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
 					 le16_to_cpu(vlan));
 	else
-		netif_receive_skb(skb);
+		napi_gro_receive(&adapter->napi, skb);
 }
 
 /**