diff options
| author | David S. Miller <[email protected]> | 2018-05-23 15:53:00 -0400 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-05-23 15:53:00 -0400 |
| commit | 5ee6ad201e6cba94e199da78a7fdece8881352b4 (patch) | |
| tree | a009bd4981c8682578f32994e480c9deecab5924 /scripts/bpf_helpers_doc.py | |
| parent | 5a867abdf6db501af37004c331a7dbe81d4fe0b2 (diff) | |
| parent | bad2929733635f80f99930b252757c70372356fe (diff) | |
Merge tag 'mac80211-next-for-davem-2018-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
For this round, we have various things all over the place, notably
* a fix for a race in aggregation, which I want to let
bake for a bit longer before sending to stable
* some new statistics (ACK RSSI, TXQ)
* TXQ configuration
* preparations for HE, particularly radiotap
* replace confusing "country IE" by "country element" since it's
not referring to Ireland
Note that I merged net-next to get a fix from mac80211 that got
there via net, to apply one patch that would otherwise conflict.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'scripts/bpf_helpers_doc.py')
0 files changed, 0 insertions, 0 deletions