diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-07 09:40:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-07 09:40:58 -0700 |
| commit | 0f2be423f1fa70df4e3b91224bcdded76675308c (patch) | |
| tree | d1400541279bf4ebcc339fcbb08137ea718eafce /include/net | |
| parent | 8e0deed92406d93ae0365cb8a6134db5721e7aca (diff) | |
| parent | bde59c475e0883e4c4294bcd9b9c7e08ae18c828 (diff) | |
| download | linux-0f2be423f1fa70df4e3b91224bcdded76675308c.tar.gz linux-0f2be423f1fa70df4e3b91224bcdded76675308c.tar.bz2 linux-0f2be423f1fa70df4e3b91224bcdded76675308c.zip | |
Merge tag 'mac80211-for-davem-2017-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Back from a long absence, so we have a number of things:
* a remain-on-channel fix from Avi
* hwsim TX power fix from Beni
* null-PTR dereference with iTXQ in some rare configurations (Chunho)
* 40 MHz custom regdomain fixes (Emmanuel)
* look at right place in HT/VHT capability parsing (Igor)
* complete A-MPDU teardown properly (Ilan)
* Mesh ID Element ordering fix (Liad)
* avoid tracing warning in ht_dbg() (Sharon)
* fix print of assoc/reassoc (Simon)
* fix encrypted VLAN with iTXQ (myself)
* fix calling context of TX queue wake (myself)
* fix a deadlock with ath10k aggregation (myself)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f8149ca192b4..885690fa39c8 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -919,21 +919,10 @@ struct ieee80211_tx_info { unsigned long jiffies; }; /* NB: vif can be NULL for injected frames */ - union { - /* NB: vif can be NULL for injected frames */ - struct ieee80211_vif *vif; - - /* When packets are enqueued on txq it's easy - * to re-construct the vif pointer. There's no - * more space in tx_info so it can be used to - * store the necessary enqueue time for packet - * sojourn time computation. - */ - codel_time_t enqueue_time; - }; + struct ieee80211_vif *vif; struct ieee80211_key_conf *hw_key; u32 flags; - /* 4 bytes free */ + codel_time_t enqueue_time; } control; struct { u64 cookie; |