X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fmac80211%2Fsta_info.c;h=ffe8a49d89273b47de10673516ed828c19d8d781;hb=c715350828b12ce3b29e655fec7a7d6b22245d00;hp=cfd8ee9adad0e13df8a57d6c95190b15ce3212ab;hpb=4fd3670eb1d3c33e8952cf1e79edbb2d517dcfb5;p=powerpc.git

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index cfd8ee9ada..ffe8a49d89 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -346,11 +346,10 @@ void sta_info_init(struct ieee80211_local *local)
 	rwlock_init(&local->sta_lock);
 	INIT_LIST_HEAD(&local->sta_list);
 
-	init_timer(&local->sta_cleanup);
+	setup_timer(&local->sta_cleanup, sta_info_cleanup,
+		    (unsigned long)local);
 	local->sta_cleanup.expires =
 		round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL);
-	local->sta_cleanup.data = (unsigned long) local;
-	local->sta_cleanup.function = sta_info_cleanup;
 
 #ifdef CONFIG_MAC80211_DEBUGFS
 	INIT_WORK(&local->sta_debugfs_add, sta_info_debugfs_add_task);