---

yaml --- r: 352197 b: refs/heads/master c: 5d979f3 h: refs/heads/master i: 352195: ce5d4b7 v: v3
git-mirror · Dec 4, 2012 · 398675a · 398675a
1 parent 20dcc64
commit 398675a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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);