]> 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>
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)
commiteaff0b793a8b350d46da10b2a37419e302ddc932
treec5b4015ae851736c28d7cddc5be10bdf9397cc48
parent728d8fc28fe7e28923a58b7b020e4b60df66964c
parenta796fa1d381377640c4f72533f3a9822253bda77
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-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