diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-29 01:19:15 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-29 01:19:15 +0400 |
| commit | f5c7e1a47aeca2b31106aa94e7f4daa218e6c478 (patch) | |
| tree | a5a0ed3429f83d7404dc4d8fe19ac060d6ddb307 /net/ipv6 | |
| parent | fe2c5fb1ef24e97b7cf96e24200bbe503286cb95 (diff) | |
| parent | 689f1c9de2abbd76fda224d12cea5f43568a4335 (diff) | |
| download | linux-f5c7e1a47aeca2b31106aa94e7f4daa218e6c478.tar.xz | |
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ah6.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index fcffd4e522c8..6d16eb0e0c7f 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -713,8 +713,6 @@ static int ah6_init_state(struct xfrm_state *x) ahp->icv_full_len = aalg_desc->uinfo.auth.icv_fullbits/8; ahp->icv_trunc_len = x->aalg->alg_trunc_len/8; - BUG_ON(ahp->icv_trunc_len > MAX_AH_AUTH_LEN); - x->props.header_len = XFRM_ALIGN8(sizeof(struct ip_auth_hdr) + ahp->icv_trunc_len); switch (x->props.mode) { |