History

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. ====================

David S. Miller committed 9 years ago

Commit a43dce92 parents 0c45d7f 077fbac16 files · +121 −37Browse files

Showing the changes to include/uapi/linux (1 of 16 files). Show all

Unified · Split

include/uapi/linux/xfrm.h+1−0
@@ -304,6 +304,7 @@ enum xfrm_attr_type_t { · 303 unmodified lines
304 XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */304 XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */
305 XFRMA_PAD,305 XFRMA_PAD,
306 XFRMA_OFFLOAD_DEV, /* struct xfrm_state_offload */306 XFRMA_OFFLOAD_DEV, /* struct xfrm_state_offload */
307 XFRMA_OUTPUT_MARK, /* __u32 */
307 __XFRMA_MAX308 __XFRMA_MAX
308 309
309#define XFRMA_MAX (__XFRMA_MAX - 1)310#define XFRMA_MAX (__XFRMA_MAX - 1)