From patchwork Wed Sep 15 16:37:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Philips X-Patchwork-Id: 64849 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.180.67]) by ozlabs.org (Postfix) with ESMTP id C9CCFB70D8 for ; Thu, 16 Sep 2010 02:41:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754305Ab0IOQlj (ORCPT ); Wed, 15 Sep 2010 12:41:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33611 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751961Ab0IOQli (ORCPT ); Wed, 15 Sep 2010 12:41:38 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 4AEC287567; Wed, 15 Sep 2010 18:41:36 +0200 (CEST) Date: Wed, 15 Sep 2010 09:37:49 -0700 From: Brandon Philips To: David Miller Cc: jeffrey.t.kirsher@intel.com, jesse.brandeburg@intel.com, bruce.w.allan@intel.com, alexander.h.duyck@intel.com, peter.p.waskiewicz.jr@intel.com, john.ronciak@intel.com, donald.c.skidmore@intel.com, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Subject: [PATCH] vlan: enable GRO if real_dev supports it Message-ID: <20100915163749.GA4191@mmm.home.ifup.org> References: <20100915015052.GA6602@mmm.home.ifup.org> <20100914.213544.112598547.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100914.213544.112598547.davem@davemloft.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently vlan devices don't have GRO by default as none of the Ethernet drivers add NETIF_F_GRO to their vlan_features. As GRO is a software feature just propogate GRO from the real_dev in the vlan core. There is no need to have the drivers each add NETIF_F_GRO to their vlan_features. Signed-off-by: Brandon Philips --- net/8021q/vlan_dev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 3bccdd1..6fbc445 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -735,6 +735,7 @@ static int vlan_dev_init(struct net_device *dev) (1<<__LINK_STATE_DORMANT))) | (1<<__LINK_STATE_PRESENT); + dev->features |= real_dev->features & NETIF_F_GRO; dev->features |= real_dev->features & real_dev->vlan_features; dev->gso_max_size = real_dev->gso_max_size;