diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-16 16:35:49 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2017-11-20 16:55:11 +0100 |
| commit | 34f11cd329580fe4c3e8f10081d687331fc710f3 (patch) | |
| tree | e3918de464907d9776bb1a91d5da393027bc90a5 /net/mac80211/sta_info.c | |
| parent | net: vxge: Fix some indentation issues (diff) | |
| download | linux-dev-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.xz linux-dev-34f11cd329580fe4c3e8f10081d687331fc710f3.zip | |
mac80211: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/mac80211/sta_info.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index a3060e55122c..0e50065e3433 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1064,9 +1064,9 @@ int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata, return ret; } -static void sta_info_cleanup(unsigned long data) +static void sta_info_cleanup(struct timer_list *t) { - struct ieee80211_local *local = (struct ieee80211_local *) data; + struct ieee80211_local *local = from_timer(local, t, sta_cleanup); struct sta_info *sta; bool timer_needed = false; @@ -1098,8 +1098,7 @@ int sta_info_init(struct ieee80211_local *local) mutex_init(&local->sta_mtx); INIT_LIST_HEAD(&local->sta_list); - setup_timer(&local->sta_cleanup, sta_info_cleanup, - (unsigned long)local); + timer_setup(&local->sta_cleanup, sta_info_cleanup, 0); return 0; } |