diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-21 20:30:57 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-21 20:30:57 +0900 |
| commit | a13e8d418f3cb9d0b4efa6e744b8b23c0e3cdfe8 (patch) | |
| tree | a294d1434ebca50330b797803b22749f91866ab7 /net/mac80211/mesh_hwmp.c | |
| parent | b48b1f7ac716e3f0474f8b94bc471c6e47b2f57a (diff) | |
| parent | 33ddd81e2bd5d9970b9f01ab383ba45035fa41ee (diff) | |
| download | linux-a13e8d418f3cb9d0b4efa6e744b8b23c0e3cdfe8.tar.bz2 | |
Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few things:
* straggler timer conversions from Kees
* memory leak fix in hwsim
* fix some fallout from regdb changes if wireless is built-in
* also free aggregation sessions in startup state when station
goes away, to avoid crashing the timer
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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; |