From cd6dfd0203843dc35445593ea64706a13e636510 Mon Sep 17 00:00:00 2001
From: Stone Piao <piaoyun@marvell.com>
Date: Tue, 25 Sep 2012 20:23:37 -0700
Subject: [PATCH] --- yaml --- r: 328371 b: refs/heads/master c:
 eab1c76bfc40904ddc9edc4f076ff7749696870a h: refs/heads/master i:   328369:
 182e7151a99c9b40f7f86311bb23f1895fc4c4cc   328367:
 b80958e9f7533e8efee0281cc2048ab79d30b537 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/net/wireless/mwifiex/fw.h        |  1 +
 trunk/drivers/net/wireless/mwifiex/sta_event.c | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6835a545c0e6..5c1ba02ebc11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7feb4c48313d58b445a91a598d99c025029ce00b
+refs/heads/master: eab1c76bfc40904ddc9edc4f076ff7749696870a
diff --git a/trunk/drivers/net/wireless/mwifiex/fw.h b/trunk/drivers/net/wireless/mwifiex/fw.h
index 9818cae7faf7..b8a07ade2e68 100644
--- a/trunk/drivers/net/wireless/mwifiex/fw.h
+++ b/trunk/drivers/net/wireless/mwifiex/fw.h
@@ -392,6 +392,7 @@ enum ENH_PS_MODES {
 #define EVENT_BW_CHANGE                 0x00000048
 #define EVENT_UAP_MIC_COUNTERMEASURES   0x0000004c
 #define EVENT_HOSTWAKE_STAIE		0x0000004d
+#define EVENT_REMAIN_ON_CHAN_EXPIRED    0x0000005f
 
 #define EVENT_ID_MASK                   0xffff
 #define BSS_NUM_MASK                    0xf
diff --git a/trunk/drivers/net/wireless/mwifiex/sta_event.c b/trunk/drivers/net/wireless/mwifiex/sta_event.c
index dff51d55271c..aafde30e714a 100644
--- a/trunk/drivers/net/wireless/mwifiex/sta_event.c
+++ b/trunk/drivers/net/wireless/mwifiex/sta_event.c
@@ -410,6 +410,18 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 		dev_dbg(adapter->dev, "event: HOSTWAKE_STAIE %d\n", eventcause);
 		break;
 
+	case EVENT_REMAIN_ON_CHAN_EXPIRED:
+		dev_dbg(adapter->dev, "event: Remain on channel expired\n");
+		cfg80211_remain_on_channel_expired(priv->wdev,
+						   priv->roc_cfg.cookie,
+						   &priv->roc_cfg.chan,
+						   priv->roc_cfg.chan_type,
+						   GFP_ATOMIC);
+
+		memset(&priv->roc_cfg, 0x00, sizeof(struct mwifiex_roc_cfg));
+
+		break;
+
 	default:
 		dev_dbg(adapter->dev, "event: unknown event id: %#x\n",
 			eventcause);