---

yaml
---
r: 266495
b: refs/heads/master
c: 6d095fa
h: refs/heads/master
i:
  266493: 8e11a67
  266491: faafc8e
  266487: 52cbcdb
  266479: 6734157
  266463: 7869c31
  266431: df022a0
  266367: 80fcd03
  266239: 79d1193
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5faf030c9b6cc48c33301b4f3341f2b5c374f6b5
+refs/heads/master: 6d095fa8cb1bb87fe8bf956cdf6211e784b4c9e4

trunk/drivers/net/ethernet/intel/igb/igb.h

@@ -231,7 +231,6 @@ struct igb_ring {
 			struct igb_tx_queue_stats tx_stats;
 			struct u64_stats_sync tx_syncp;
 			struct u64_stats_sync tx_syncp2;
-			bool detect_tx_hung;
 		};
 		/* RX */
 		struct {

trunk/drivers/net/ethernet/intel/igb/igb_main.c

@@ -3754,7 +3754,7 @@ static void igb_watchdog_task(struct work_struct *work)
 		}
 
 		/* Force detection of hung controller every watchdog period */
-		tx_ring->detect_tx_hung = true;
+		set_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);
 	}
 
 	/* Cause software interrupt to ensure rx ring is cleaned */
@@ -5721,14 +5721,14 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 	q_vector->tx.total_bytes += total_bytes;
 	q_vector->tx.total_packets += total_packets;
 
-	if (tx_ring->detect_tx_hung) {
+	if (test_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags)) {
 		struct e1000_hw *hw = &adapter->hw;
 
 		eop_desc = tx_buffer->next_to_watch;
 
 		/* Detect a transmit hang in hardware, this serializes the
 		 * check with the clearing of time_stamp and movement of i */
-		tx_ring->detect_tx_hung = false;
+		clear_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);
 		if (eop_desc &&
 		    time_after(jiffies, tx_buffer->time_stamp +
 			       (adapter->tx_timeout_factor * HZ)) &&