diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /net/ipv6/esp6.c | |
parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) |
Merge branch 'master'
Diffstat (limited to 'net/ipv6/esp6.c')
-rw-r--r-- | net/ipv6/esp6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 40d9a1935ab5..8bfbe9970793 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -248,7 +248,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu) if (esp->conf.padlen) mtu = ALIGN(mtu, esp->conf.padlen); - return mtu + x->props.header_len + esp->auth.icv_full_len; + return mtu + x->props.header_len + esp->auth.icv_trunc_len; } static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |