diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-19 22:43:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-19 22:43:17 +0200 |
| commit | b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9 (patch) | |
| tree | 2571cd6731602fbcf00dde1ec4466999859add2c /net/mac80211/ieee80211_i.h | |
| parent | be2net: make hwmon interface optional (diff) | |
| parent | mac80211: fix throughput LED trigger (diff) | |
| download | linux-b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9.tar.xz linux-b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9.zip | |
Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
This just has a few fixes:
* LED throughput trigger was crashing
* fast-xmit wasn't treating QoS changes in IBSS correctly
* TDLS could use the wrong channel definition
* using a reserved channel context could use the wrong channel width
====================
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 241b74f3bd81..2c4fe45ea38a 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1038,7 +1038,6 @@ enum queue_stop_reason { #ifdef CONFIG_MAC80211_LEDS struct tpt_led_trigger { - struct led_trigger trig; char name[32]; const struct ieee80211_tpt_blink *blink_table; unsigned int blink_table_len; |