summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-10-30 15:59:25 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 21:17:40 +0100
commitab1ef980504ca7f17b675b3a53a88956f800fce3 (patch)
tree2940be7dafe8169da1a4a82713d11d2d6b062a67 /drivers/net
parentnl80211: Add TX queue parameter configuration (diff)
downloadlinux-ab1ef980504ca7f17b675b3a53a88956f800fce3.tar.xz
linux-ab1ef980504ca7f17b675b3a53a88956f800fce3.zip
mac80211_hwsim: Make sure beacon_timer gets deleted
It was possible to trigger a kernel panic because beacon_timer may not have been deleted in all cases when the kernel module was removed while hostapd was still running. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 2b07d4b865ae..bc9da9393760 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/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__);
}