---

yaml --- r: 121815 b: refs/heads/master c: ab1ef98 h: refs/heads/master i: 121813: e7cce74 121811: 0875e80 121807: 2527e04 v: v3
git-mirror · Nov 10, 2008 · e066f7c · e066f7c
1 parent 219d52f
commit e066f7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 318884875bdddca663ecc373c813cf8e117d9e43
+refs/heads/master: ab1ef980504ca7f17b675b3a53a88956f800fce3
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -290,6 +290,7 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw)
 {
 	struct mac80211_hwsim_data *data = hw->priv;
 	data->started = 0;
+	del_timer(&data->beacon_timer);
 	printk(KERN_DEBUG "%s:%s\n", wiphy_name(hw->wiphy), __func__);
 }