diff options
| author | David S. Miller | 2017-10-09 18:43:34 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-10-09 18:43:34 +0200 |
| commit | 93b03193c6a579dbe5e19139d1ab47b70dbeeebd (patch) | |
| tree | fafe769e2780bdc76bf815893cf07fd647f8389f /net/wireless/nl80211.c | |
| parent | ipv4: Fix traffic triggered IPsec connections. (diff) | |
| parent | xfrm: don't call xfrm_policy_cache_flush under xfrm_state_lock (diff) | |
| download | kernel-qcow2-linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.tar.gz kernel-qcow2-linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.tar.xz kernel-qcow2-linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2017-10-09
1) Fix some error paths of the IPsec offloading API.
2) Fix a NULL pointer dereference when IPsec is used
with vti. From Alexey Kodanev.
3) Don't call xfrm_policy_cache_flush under xfrm_state_lock,
it triggers several locking warnings. From Artem Savkov.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/nl80211.c')
0 files changed, 0 insertions, 0 deletions