Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Mon, 21 Aug 2017 16:29:47 +0000 (09:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Aug 2017 16:29:47 +0000 (09:29 -0700)
commita43dce93587bfb5f65fa40647977ef72a7ba6699
treec5b4015ae851736c28d7cddc5be10bdf9397cc48
parent0c45d7fe12c7e1510bae9dfac189c8b927e4636b
parent077fbac405bfc6d41419ad6c1725804ad4e9887c
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-08-21

1) Support RX checksum with IPsec crypto offload for esp4/esp6.
   From Ilan Tayari.

2) Fixup IPv6 checksums when doing IPsec crypto offload.
   From Yossi Kuperman.

3) Auto load the xfrom offload modules if a user installs
   a SA that requests IPsec offload. From Ilan Tayari.

4) Clear RX offload informations in xfrm_input to not
   confuse the TX path with stale offload informations.
   From Ilan Tayari.

5) Allow IPsec GSO for local sockets if the crypto operation
   will be offloaded.

6) Support setting of an output mark to the xfrm_state.
   This mark can be used to to do the tunnel route lookup.
   From Lorenzo Colitti.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock.c
net/xfrm/xfrm_policy.c