Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932379Ab0ANVx4 (ORCPT ); Thu, 14 Jan 2010 16:53:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932345Ab0ANVxn (ORCPT ); Thu, 14 Jan 2010 16:53:43 -0500 Received: from victor.provo.novell.com ([137.65.250.26]:48194 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932276Ab0ANVxf (ORCPT ); Thu, 14 Jan 2010 16:53:35 -0500 From: Patrick Mullaney Subject: [PATCH 2/3] macvlan: add GRO bit to features mask To: alacrityvm-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, kaber@trash.net, arnd@arndb.de, netdev@vger.kernel.org Date: Thu, 14 Jan 2010 16:53:10 -0500 Message-ID: <20100114215310.4958.46657.stgit@mimic.site> In-Reply-To: <20100114215058.4958.87746.stgit@mimic.site> References: <20100114215058.4958.87746.stgit@mimic.site> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 999 Lines: 27 Allow macvlan devices to support GRO. Signed-off-by: Patrick Mullaney --- drivers/net/macvlan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 0a389b8..94bb135 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -316,7 +316,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key; #define MACVLAN_FEATURES \ (NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \ - NETIF_F_TSO_ECN | NETIF_F_TSO6) + NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO) #define MACVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/