diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
| commit | 20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch) | |
| tree | 6888e6c6b8f2beef67b3f85570aebb853f8443f9 /net/ipv6/esp6.c | |
| parent | 92f268e034faf793f6d40de2f0fc81478a14ff39 (diff) | |
| parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (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) | |||
| 248 | if (esp->conf.padlen) | 248 | if (esp->conf.padlen) |
| 249 | mtu = ALIGN(mtu, esp->conf.padlen); | 249 | mtu = ALIGN(mtu, esp->conf.padlen); |
| 250 | 250 | ||
| 251 | return mtu + x->props.header_len + esp->auth.icv_full_len; | 251 | return mtu + x->props.header_len + esp->auth.icv_trunc_len; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 254 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |