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/ieee80211_i.h | |
parent | nfp: flower: add missing kdoc (diff) | |
parent | mac80211: properly free requested-but-not-started TX agg sessions (diff) | |
download | linux-dev-a13e8d418f3cb9d0b4efa6e744b8b23c0e3cdfe8.tar.xz linux-dev-a13e8d418f3cb9d0b4efa6e744b8b23c0e3cdfe8.zip |
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/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 68f874e73561..885d00b41911 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1057,6 +1057,7 @@ struct tpt_led_trigger { const struct ieee80211_tpt_blink *blink_table; unsigned int blink_table_len; struct timer_list timer; + struct ieee80211_local *local; unsigned long prev_traffic; unsigned long tx_bytes, rx_bytes; unsigned int active, want; @@ -1932,7 +1933,7 @@ static inline int ieee80211_ac_from_tid(int tid) void ieee80211_dynamic_ps_enable_work(struct work_struct *work); void ieee80211_dynamic_ps_disable_work(struct work_struct *work); -void ieee80211_dynamic_ps_timer(unsigned long data); +void ieee80211_dynamic_ps_timer(struct timer_list *t); void ieee80211_send_nullfunc(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, bool powersave); |