From patchwork Sat Oct 11 01:34:58 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 3906 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 DE936DDED4 for ; Sat, 11 Oct 2008 12:35:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754344AbYJKBfU (ORCPT ); Fri, 10 Oct 2008 21:35:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754198AbYJKBfU (ORCPT ); Fri, 10 Oct 2008 21:35:20 -0400 Received: from qmta04.westchester.pa.mail.comcast.net ([76.96.62.40]:36693 "EHLO QMTA04.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754116AbYJKBfU (ORCPT ); Fri, 10 Oct 2008 21:35:20 -0400 Received: from OMTA01.westchester.pa.mail.comcast.net ([76.96.62.11]) by QMTA04.westchester.pa.mail.comcast.net with comcast id R2ru1a04V0EZKEL54DbJ4D; Sat, 11 Oct 2008 01:35:18 +0000 Received: from gitlost.lost ([63.64.152.142]) by OMTA01.westchester.pa.mail.comcast.net with comcast id RDay1a00N34bfcX3MDb1NA; Sat, 11 Oct 2008 01:35:16 +0000 X-Authority-Analysis: v=1.0 c=1 a=x0xRiaos0K8A:10 a=4VmUcTGQuXcA:10 a=K83-zl4ufCePU8bfMZIA:9 a=iBUNlmF04ufBuBXUv8UC6B0RPCQA:4 a=1jcDQfjXLUsA:10 a=dGJ0OcVc7YAA:10 a=iYlkOlhu7C0A:10 From: Jeff Kirsher Subject: [PATCH] e1000: allow VLAN devices to use TSO and CSUM offload To: davem@davemloft.net, jeff@garzik.org Cc: netdev@vger.kernel.org, Patrick McHardy , Jesse Brandeburg , Jeff Kirsher Date: Fri, 10 Oct 2008 18:34:58 -0700 Message-ID: <20081011013458.11804.35278.stgit@gitlost.lost> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Patrick McHardy This patch changes e1000 to set vlan_features so TSO and CSUM offload can be used by VLAN devices, similar as with the other Intel drivers. Signed-off-by: Patrick McHardy Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher --- drivers/net/e1000/e1000_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index ad6da7b..dd5ea4e 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -1053,6 +1053,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, netdev->features |= NETIF_F_LLTX; + netdev->vlan_features |= NETIF_F_TSO; + netdev->vlan_features |= NETIF_F_TSO6; + netdev->vlan_features |= NETIF_F_HW_CSUM; + netdev->vlan_features |= NETIF_F_SG; + adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw); /* initialize eeprom parameters */