From 972db117d9635adebc8f2bd7cb22c83faece338b Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 26 Aug 2011 07:46:19 +0000 Subject: [PATCH] --- yaml --- r: 266495 b: refs/heads/master c: 6d095fa8cb1bb87fe8bf956cdf6211e784b4c9e4 h: refs/heads/master i: 266493: 8e11a67bc5e1967bf6608466e7ea62149e5a8763 266491: faafc8e197d2dd7f6e1ce0b6299ab950125b10c9 266487: 52cbcdb9c0c58a0150c426847268b95f4c251a7e 266479: 6734157235b3449d4efd8c829ca15ca177b60d2c 266463: 7869c3120e511fded03814b6b724cf99ec05b091 266431: df022a0962a14a1632981dbea0c70bda4f4f85f8 266367: 80fcd03fef8fc1d4dff0afc43eae96486454b26f 266239: 79d1193d4f9a44b874ec8089d10a7c49d00f5c12 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/igb.h | 1 - trunk/drivers/net/ethernet/intel/igb/igb_main.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2dfaf42c6f83..9b1aa4a7f57c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5faf030c9b6cc48c33301b4f3341f2b5c374f6b5 +refs/heads/master: 6d095fa8cb1bb87fe8bf956cdf6211e784b4c9e4 diff --git a/trunk/drivers/net/ethernet/intel/igb/igb.h b/trunk/drivers/net/ethernet/intel/igb/igb.h index 11d17f14aeeb..4e665a9b4763 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb.h +++ b/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 { diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c index 971aea9843d2..77ade67ddbdc 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c +++ b/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)) &&