diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 04e007dcf474..1b5a0c8b34c8 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -3831,11 +3831,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, | |||
3831 | buffer_info = &tx_ring->buffer_info[i]; | 3831 | buffer_info = &tx_ring->buffer_info[i]; |
3832 | size = min(len, max_per_txd); | 3832 | size = min(len, max_per_txd); |
3833 | 3833 | ||
3834 | /* Workaround for premature desc write-backs | ||
3835 | * in TSO mode. Append 4-byte sentinel desc */ | ||
3836 | if (mss && !nr_frags && size == len && size > 8) | ||
3837 | size -= 4; | ||
3838 | |||
3839 | buffer_info->length = size; | 3834 | buffer_info->length = size; |
3840 | /* set time_stamp *before* dma to help avoid a possible race */ | 3835 | /* set time_stamp *before* dma to help avoid a possible race */ |
3841 | buffer_info->time_stamp = jiffies; | 3836 | buffer_info->time_stamp = jiffies; |
@@ -3869,10 +3864,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, | |||
3869 | while (len) { | 3864 | while (len) { |
3870 | buffer_info = &tx_ring->buffer_info[i]; | 3865 | buffer_info = &tx_ring->buffer_info[i]; |
3871 | size = min(len, max_per_txd); | 3866 | size = min(len, max_per_txd); |
3872 | /* Workaround for premature desc write-backs | ||
3873 | * in TSO mode. Append 4-byte sentinel desc */ | ||
3874 | if (mss && f == (nr_frags-1) && size == len && size > 8) | ||
3875 | size -= 4; | ||
3876 | 3867 | ||
3877 | buffer_info->length = size; | 3868 | buffer_info->length = size; |
3878 | buffer_info->time_stamp = jiffies; | 3869 | buffer_info->time_stamp = jiffies; |