From 941ccb711f8ac82e6f511d62068383c38cd3a8b7 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 16 Oct 2009 13:18:58 +0800
Subject: [PATCH] --- yaml --- r: 171015 b: refs/heads/master c:
 7fd6b12f329b7ec1c1e3ad49d701d2ac7ab42d9e h: refs/heads/master i:   171013:
 4126ed15da1bdc27c4fa181fd80f5628bfbd815d   171011:
 1e62e41adc5e20d8228da564429e3bb1363b450e   171007:
 305b2860826f0469155f3a104af3ace31676c9ca v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a0545c05f19..3547fd124854 100644
--- 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
index 5fa0a63ef0bf..bca3bb2d2dec 100644
--- 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: