diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-19 17:39:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-19 17:39:11 +0300 |
| commit | c6479d6257e093ccbb1ae1ff84901794cbe2d73f (patch) | |
| tree | 9a2fc367eef7e751341cf3b93f006530f5f27f34 /net/ipv6/ip6_tunnel.c | |
| parent | ab14436065c8066c265540312742390d6d07ddd2 (diff) | |
| parent | 04a7279ff12fc47b657f70731d401c0064f5838a (diff) | |
| download | linux-c6479d6257e093ccbb1ae1ff84901794cbe2d73f.tar.xz | |
Merge tag 'mac80211-for-davem-2017-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few more fixes:
* hwsim:
- set To-DS bit in some frames missing it
- fix sleeping in atomic
* nl80211:
- doc cleanup
- fix locking in an error path
* build:
- don't append to created certs C files
- ship certificate pre-hexdumped
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
0 files changed, 0 insertions, 0 deletions