]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Jun 2017 18:17:31 +0000 (14:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Jun 2017 18:17:31 +0000 (14:17 -0400)
commitfc639b5a0f1ed978a5a2d1841c2268094ce09227
treefd34e9c7e0485615e63e0608cf81f9dfc62a1582
parent8fd7d0969c73c5e70e48372dceb777597cbd7749
parent270e17eb00cc3303d24f7018b7327c9569929e2e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-06-23

1) Use memdup_user to spmlify xfrm_user_policy.
   From Geliang Tang.

2) Make xfrm_dev_register static to silence a sparse warning.
   From Wei Yongjun.

3) Use crypto_memneq to check the ICV in the AH protocol.
   From Sabrina Dubroca.

4) Remove some unused variables in esp6.
   From Stephen Hemminger.

5) Extend XFRM MIGRATE to allow to change the UDP encapsulation port.
   From Antony Antony.

6) Include the UDP encapsulation port to km_migrate announcements.
   From Antony Antony.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/xfrm.h
net/ipv4/ah4.c
net/ipv6/ah6.c
net/ipv6/esp6.c
net/key/af_key.c
net/xfrm/xfrm_device.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c