diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-05 10:39:10 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:47:52 +0200 |
| commit | 4c02d62fa37a05254a87575c7d430819f77bd6c9 (patch) | |
| tree | 046e98fd9c69e40bd3453540599883469d342c6d /net/mac80211/mesh.h | |
| parent | Merge remote-tracking branch 'net-next/master' into mac80211-next (diff) | |
| download | linux-dev-4c02d62fa37a05254a87575c7d430819f77bd6c9.tar.xz linux-dev-4c02d62fa37a05254a87575c7d430819f77bd6c9.zip | |
net/mac80211/mesh_plink: 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. This requires adding a pointer back
to the sta_info since container_of() can't resolve the sta_info.
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.h')
| -rw-r--r-- | net/mac80211/mesh.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index 7e5f271e3c30..465b7853edc0 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -275,6 +275,7 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, u8 *hw_addr, struct ieee802_11_elems *ie); bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie); u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata); +void mesh_plink_timer(struct timer_list *t); void mesh_plink_broken(struct sta_info *sta); u32 mesh_plink_deactivate(struct sta_info *sta); u32 mesh_plink_open(struct sta_info *sta); |