Patchwork [09/13] Revert "UBUNTU: SAUCE: r8169: disable TSO by default for RTL8111/8168B chipsets."

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:18 p.m.
Message ID <1274483897.19284.3334.camel@emiko>
Download mbox | patch
Permalink /patch/53224/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:18 p.m.
>From f335695dd47b8164207b03e09b7ecfa62d920e60 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
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 <leann.ogasawara@canonical.com>
---
 drivers/net/r8169.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

Patch

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;