diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-29 15:09:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-29 15:09:26 +0200 |
| commit | 0933cc294f7a5004210c200b540d2d1c14112095 (patch) | |
| tree | 7c181fe1b3b3aa3eee6d4f680fa4ada37b9ae33a /net/can | |
| parent | net, mm: account sock objects to kmemcg (diff) | |
| parent | nl80211: check nla_parse_nested() return values (diff) | |
| download | linux-0933cc294f7a5004210c200b540d2d1c14112095.tar.xz linux-0933cc294f7a5004210c200b540d2d1c14112095.zip | |
Merge tag 'mac80211-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just three fixes:
* fix HT operation in mesh mode
* disable preemption in control frame TX
* check nla_parse_nested() return values
where missing (two places)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions