From 398675a16135405efccc0fa87f6b9bdbd52102e4 Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 27 Nov 2012 08:44:48 +0200
Subject: [PATCH] --- yaml --- r: 352197 b: refs/heads/master c:
 5d979f35179c365a6455302bd5a1fa0063a4065e h: refs/heads/master i:   352195:
 ce5d4b7e70251030884749d94a428c25d37b6e08 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wlcore/main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 082193b4027a..486aba7ddb0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2718bf409937655f9b0bbc174faee3ac2ecf1062
+refs/heads/master: 5d979f35179c365a6455302bd5a1fa0063a4065e
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
index 1b42cb3d472a..33392168bf39 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/main.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -2414,6 +2414,11 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 		wl->sched_vif = NULL;
 	}
 
+	if (wl->roc_vif == vif) {
+		wl->roc_vif = NULL;
+		ieee80211_remain_on_channel_expired(wl->hw);
+	}
+
 	if (!test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
 		/* disable active roles */
 		ret = wl1271_ps_elp_wakeup(wl);