---

yaml --- r: 171015 b: refs/heads/master c: 7fd6b12 h: refs/heads/master i: 171013: 4126ed1 171011: 1e62e41 171007: 305b286 v: v3
git-mirror · Oct 27, 2009 · 941ccb7 · 941ccb7
1 parent 711d974
commit 941ccb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9829e1b510214956bc9d5e278be49d781e1a6fbf
+refs/heads/master: 7fd6b12f329b7ec1c1e3ad49d701d2ac7ab42d9e
diff --git a/trunk/drivers/net/wireless/iwmc3200wifi/rx.c b/trunk/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1321,6 +1321,14 @@ int iwm_rx_handle(struct iwm_priv *iwm, u8 *buf, unsigned long buf_size)
 
 	switch (le32_to_cpu(hdr->cmd)) {
 	case UMAC_REBOOT_BARKER:
+		if (test_bit(IWM_STATUS_READY, &iwm->status)) {
+			IWM_ERR(iwm, "Unexpected BARKER\n");
+
+			schedule_work(&iwm->reset_worker);
+
+			return 0;
+		}
+
 		return iwm_notif_send(iwm, NULL, IWM_BARKER_REBOOT_NOTIFICATION,
 				      IWM_SRC_UDMA, buf, buf_size);
 	case UMAC_ACK_BARKER: