From e066f7c10cde269c1ff108247adf19d0fc71dd5d Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Thu, 30 Oct 2008 16:59:25 +0200
Subject: [PATCH] --- yaml --- r: 121815 b: refs/heads/master c:
 ab1ef980504ca7f17b675b3a53a88956f800fce3 h: refs/heads/master i:   121813:
 e7cce7413ff0bd1aa3cdb766b45b33cacba4eb09   121811:
 0875e804b69a4e9a9cbcd8761500e800ad8964d7   121807:
 2527e04057ee4e82b90cca84bfd19126e82682db v: v3

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

diff --git a/[refs] b/[refs]
index 20f3a09c6b31..75bedf780dfd 100644
--- 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
index 2b07d4b865ae..bc9da9393760 100644
--- 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__);
 }