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 2014-09-25 1) Remove useless hash_resize_mutex in xfrm_hash_resize(). This mutex is used only there, but xfrm_hash_resize() can't be called concurrently at all. From Ying Xue. 2) Extend policy hashing to prefixed policies based on prefix lenght thresholds. From Christophe Gouault. 3) Make the policy hash table thresholds configurable via netlink. From Christophe Gouault. 4) Remove the maximum authentication length for AH. This was needed to limit stack usage. We switched already to allocate space, so no need to keep the limit. From Herbert Xu. ====================

David S. Miller committed 12 years ago

Commit f5c7e1a2 parents fe2c5fb 689f1c910 files · +303 −38Browse files

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

Unified · Split

include/uapi/linux/xfrm.h+7−0
@@ -328,6 +328,8 @@ enum xfrm_spdattr_type_t { · 327 unmodified lines
328328 XFRMA_SPD_UNSPEC,
329329 XFRMA_SPD_INFO,
330330 XFRMA_SPD_HINFO,
331+ XFRMA_SPD_IPV4_HTHRESH,
332+ XFRMA_SPD_IPV6_HTHRESH,
331333 __XFRMA_SPD_MAX
332334
333335 #define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1)
@@ -347,6 +349,11 @@ struct xfrmu_spdhinfo { · 13 unmodified lines
347349 __u32 spdhmcnt;
348350 };
349351
352+struct xfrmu_spdhthresh {
353+ __u8 lbits;
354+ __u8 rbits;
355+};
356+
350357 struct xfrm_usersa_info {
351358 struct xfrm_selector sel;
352359 struct xfrm_id id;