1 files changed, 4 insertions, 30 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index d9fdf69bbc6e..3bd176606c09 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -3167,38 +3167,12 @@ static inline int i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,
         /* write last descriptor with EOP bit */
         td_cmd |= I40E_TX_DESC_CMD_EOP;
 
-        /* We can OR these values together as they both are checked against
-         * 4 below and at this point desc_count will be used as a boolean value
-         * after this if/else block.
+        /* We OR these values together to check both against 4 (WB_STRIDE)
+         * below. This is safe since we don't re-use desc_count afterwards.
          */
         desc_count |= ++tx_ring->packet_stride;
 
-        /* Algorithm to optimize tail and RS bit setting:
-         * if queue is stopped
-         *      mark RS bit
-         *      reset packet counter
-         * else if xmit_more is supported and is true
-         *      advance packet counter to 4
-         *      reset desc_count to 0
-         *
-         * if desc_count >= 4
-         *      mark RS bit
-         *      reset packet counter
-         * if desc_count > 0
-         *      update tail
-         *
-         * Note: If there are less than 4 descriptors
-         * pending and interrupts were disabled the service task will
-         * trigger a force WB.
-         */
-        if (netif_xmit_stopped(txring_txq(tx_ring))) {
-                goto do_rs;
-        } else if (skb->xmit_more) {
-                /* set stride to arm on next packet and reset desc_count */
-                tx_ring->packet_stride = WB_STRIDE;
-                desc_count = 0;
-        } else if (desc_count >= WB_STRIDE) {
-do_rs:
+        if (desc_count >= WB_STRIDE) {
                 /* write last descriptor with RS bit set */
                 td_cmd |= I40E_TX_DESC_CMD_RS;
                 tx_ring->packet_stride = 0;
@@ -3219,7 +3193,7 @@ do_rs:
         first->next_to_watch = tx_desc;
 
         /* notify HW of packet */
-        if (desc_count) {
+        if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more) {
                 writel(i, tx_ring->tail);
 
                 /* we need this if more than one processor can write to our tail