---

yaml
---
r: 291165
b: refs/heads/master
c: 342bbf3
h: refs/heads/master
i:
  291163: 950c425
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26627687e881e79c8c8f9076f79181c2beefcae7
+refs/heads/master: 342bbf3fee2fa9a18147e74b2e3c4229a4564912

trunk/drivers/net/wireless/iwlwifi/iwl-core.c

@@ -1345,20 +1345,10 @@ void iwl_bg_watchdog(unsigned long data)
 	if (timeout == 0)
 		return;
 
-	/* monitor and check for stuck cmd queue */
-	if (iwl_check_stuck_queue(priv, priv->shrd->cmd_queue))
-		return;
-
-	/* monitor and check for other stuck queues */
-	if (iwl_is_any_associated(priv)) {
-		for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++) {
-			/* skip as we already checked the command queue */
-			if (cnt == priv->shrd->cmd_queue)
-				continue;
-			if (iwl_check_stuck_queue(priv, cnt))
-				return;
-		}
-	}
+	/* monitor and check for stuck queues */
+	for (cnt = 0; cnt < hw_params(priv).max_txq_num; cnt++)
+		if (iwl_check_stuck_queue(priv, cnt))
+			return;
 
 	mod_timer(&priv->watchdog, jiffies +
 		  msecs_to_jiffies(IWL_WD_TICK(timeout)));