diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-06 10:55:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-06 10:55:08 -0500 |
| commit | 89389b4d5524350e74974cf711fe4a18206c09d3 (patch) | |
| tree | 0ac0b66637257c82b1cf6132a052ef2d60febd49 /net/x25/x25_route.c | |
| parent | ebf6c9cb23d7e56eec8575a88071dec97ad5c6e2 (diff) | |
| parent | fd551bac4795854adaa87bad7e5136083719802b (diff) | |
Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few simple fixes:
* fix FILS AEAD cipher usage to use the correct AAD vectors
and to use synchronous algorithms
* fix using mesh HT operation data from userspace
* fix adding mesh vendor elements to beacons & plink frames
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/x25_route.c')
0 files changed, 0 insertions, 0 deletions