From 0c47c096a81d23953a7bbbf4f1619ce95829c129 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Wed, 18 Feb 2009 19:33:54 -0800 Subject: [PATCH] --- yaml --- r: 134633 b: refs/heads/master c: fcf495b415c5b7611768f54ee931ca165289c8e3 h: refs/heads/master i: 134631: 37c103a4f0e0aef0e40573cc5058e6a91c99b906 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b8a427134584..860b333d8c21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fbbcb79e5371d99565826a352c1003d0f1f0678 +refs/heads/master: fcf495b415c5b7611768f54ee931ca165289c8e3 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 04e007dcf474..1b5a0c8b34c8 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -3831,11 +3831,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, buffer_info = &tx_ring->buffer_info[i]; size = min(len, max_per_txd); - /* Workaround for premature desc write-backs - * in TSO mode. Append 4-byte sentinel desc */ - if (mss && !nr_frags && size == len && size > 8) - size -= 4; - buffer_info->length = size; /* set time_stamp *before* dma to help avoid a possible race */ buffer_info->time_stamp = jiffies; @@ -3869,10 +3864,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, while (len) { buffer_info = &tx_ring->buffer_info[i]; size = min(len, max_per_txd); - /* Workaround for premature desc write-backs - * in TSO mode. Append 4-byte sentinel desc */ - if (mss && f == (nr_frags-1) && size == len && size > 8) - size -= 4; buffer_info->length = size; buffer_info->time_stamp = jiffies;