diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-17 01:35:49 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-11-20 16:55:11 +0100 |
| commit | 34f11cd329580fe4c3e8f10081d687331fc710f3 (patch) | |
| tree | e3918de464907d9776bb1a91d5da393027bc90a5 /net/mac80211/mesh_hwmp.c | |
| parent | net: vxge: Fix some indentation issues (diff) | |
| download | linux-34f11cd329580fe4c3e8f10081d687331fc710f3.tar.xz linux-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 'net/mac80211/mesh_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 146ec6c0f12f..4f7826d7b47c 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -1194,9 +1194,9 @@ endlookup: return err; } -void mesh_path_timer(unsigned long data) +void mesh_path_timer(struct timer_list *t) { - struct mesh_path *mpath = (void *) data; + struct mesh_path *mpath = from_timer(mpath, t, timer); struct ieee80211_sub_if_data *sdata = mpath->sdata; int ret; |