From patchwork Tue Jan 13 09:26:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 18195 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 48B14DE2D8 for ; Tue, 13 Jan 2009 20:26:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508AbZAMJ0g (ORCPT ); Tue, 13 Jan 2009 04:26:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752299AbZAMJ0e (ORCPT ); Tue, 13 Jan 2009 04:26:34 -0500 Received: from rhun.apana.org.au ([64.62.148.172]:35826 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752263AbZAMJ0c (ORCPT ); Tue, 13 Jan 2009 04:26:32 -0500 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1LMfXY-0004SS-En; Tue, 13 Jan 2009 20:26:28 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1LMfXV-0007IA-So; Tue, 13 Jan 2009 20:26:25 +1100 Date: Tue, 13 Jan 2009 20:26:25 +1100 From: Herbert Xu To: "David S. Miller" , Jeff Kirsher , netdev@vger.kernel.org Subject: [1/2] e1000e: Invoke VLAN GRO handler Message-ID: <20090113092625.GA28015@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Dave: I'm starting to convert the LRO users now. Here's the first patch which is trivial. It simply completes the test driver that I started out with. e1000e: Invoke VLAN GRO handler Now that VLAN has GRO support as well, we can call its GRO handler as well. Signed-off-by: Herbert Xu Thanks, diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 91817d0..f73faac 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -99,8 +99,8 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, skb->protocol = eth_type_trans(skb, netdev); if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) - vlan_hwaccel_receive_skb(skb, adapter->vlgrp, - le16_to_cpu(vlan)); + vlan_gro_receive(&adapter->napi, adapter->vlgrp, + le16_to_cpu(vlan), skb); else napi_gro_receive(&adapter->napi, skb); }