Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf495b4 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

e1000e: remove workaround for e1000 hardware 



During the move of support for PCIe devices from e1000 to e1000e, this
workaround necessary only for older non-PCIe devices was mistakenly
copied into e1000e.  Remove it.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fbbcb79

drivers/net/e1000e/netdev.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -3831,11 +3831,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
		buffer_info = &tx_ring->buffer_info[i];

		buffer_info = &tx_ring->buffer_info[i];

		size = min(len, max_per_txd);

		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;

		buffer_info->length = size;

		/* set time_stamp *before* dma to help avoid a possible race */

		/* set time_stamp *before* dma to help avoid a possible race */

		buffer_info->time_stamp = jiffies;

		buffer_info->time_stamp = jiffies;
@@ -3869,10 +3864,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, 
		while (len) {

		while (len) {

			buffer_info = &tx_ring->buffer_info[i];

			buffer_info = &tx_ring->buffer_info[i];

			size = min(len, max_per_txd);

			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->length = size;

			buffer_info->time_stamp = jiffies;

			buffer_info->time_stamp = jiffies;