From patchwork Fri May 21 23:18:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53224 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 288B3B7D20 for ; Sat, 22 May 2010 09:18:44 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUG-00055X-1b; Sat, 22 May 2010 00:18:40 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUE-00055E-OJ for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:38 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbUE-0000Y1-Ms for ; Sat, 22 May 2010 00:18:38 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbUE-0006ic-9c for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:38 +0100 Subject: [PATCH 09/13] Revert "UBUNTU: SAUCE: r8169: disable TSO by default for RTL8111/8168B chipsets." From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:18:17 -0700 Message-ID: <1274483897.19284.3334.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From f335695dd47b8164207b03e09b7ecfa62d920e60 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 21 May 2010 15:07:23 -0700 Subject: [PATCH 09/13] Revert "UBUNTU: SAUCE: r8169: disable TSO by default for RTL8111/8168B chipsets." This reverts commit fa856888d50153e11c71c6cb12d1899869999213. This is another old patch we've been carrying from release to release. It was also proposed we drop this in the Lucid cycle. Drop for Maverick and see who screams. Signed-off-by: Leann Ogasawara --- drivers/net/r8169.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 4c9fbd2..dd8106f 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3160,13 +3160,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; #endif - /* Ubuntu temporary workaround for bug #76489, disable - * NETIF_F_TSO by default for RTL8111/8168B chipsets. - * People can re-enable if required */ - if (tp->mac_version == RTL_GIGA_MAC_VER_11 - || tp->mac_version == RTL_GIGA_MAC_VER_12) - dev->features &= ~NETIF_F_TSO; - tp->intr_mask = 0xffff; tp->align = cfg->align; tp->hw_start = cfg->hw_start;