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

Commit 12d04a3c authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

e1000e: commonize tx cleanup routine to match e1000 & igb 



This change updates the e1000e tx cleanup routine to more closely match
what already exists in igb and e1000.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7249dee5

drivers/net/e1000e/netdev.c

+8 −11
Original line number Diff line number Diff line
@@ -621,15 +621,16 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
	struct e1000_buffer *buffer_info;

	unsigned int i, eop;

	unsigned int count = 0;

	bool cleaned = 0;

	bool cleaned;

	unsigned int total_tx_bytes = 0, total_tx_packets = 0;



	i = tx_ring->next_to_clean;

	eop = tx_ring->buffer_info[i].next_to_watch;

	eop_desc = E1000_TX_DESC(*tx_ring, eop);



	while (eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) {

		for (cleaned = 0; !cleaned; ) {

	while ((eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) &&

	       (count < tx_ring->count)) {

		for (cleaned = 0; !cleaned; count++) {

			tx_desc = E1000_TX_DESC(*tx_ring, i);

			buffer_info = &tx_ring->buffer_info[i];

			cleaned = (i == eop);
@@ -655,10 +656,6 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 


		eop = tx_ring->buffer_info[i].next_to_watch;

		eop_desc = E1000_TX_DESC(*tx_ring, eop);

#define E1000_TX_WEIGHT 64

		/* weight of a sort for tx, to avoid endless transmit cleanup */

		if (count++ == E1000_TX_WEIGHT)

			break;

	}



	tx_ring->next_to_clean = i;
@@ -682,8 +679,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
		/* Detect a transmit hang in hardware, this serializes the

		 * check with the clearing of time_stamp and movement of i */

		adapter->detect_tx_hung = 0;

		if (tx_ring->buffer_info[eop].time_stamp &&

		    time_after(jiffies, tx_ring->buffer_info[eop].time_stamp

		if (tx_ring->buffer_info[i].time_stamp &&

		    time_after(jiffies, tx_ring->buffer_info[i].time_stamp

			       + (adapter->tx_timeout_factor * HZ))

		    && !(er32(STATUS) & E1000_STATUS_TXOFF)) {

			e1000_print_tx_hang(adapter);
@@ -694,7 +691,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
	adapter->total_tx_packets += total_tx_packets;

	adapter->net_stats.tx_bytes += total_tx_bytes;

	adapter->net_stats.tx_packets += total_tx_packets;

	return cleaned;

	return (count < tx_ring->count);

}



/**
@@ -2010,7 +2007,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) 
clean_rx:

	adapter->clean_rx(adapter, &work_done, budget);



	if (tx_cleaned)

	if (!tx_cleaned)

		work_done = budget;



	/* If budget not fully consumed, exit the polling mode */