From ed31ce6e8f72ae7b358cbf91811e72572e0fcc4f Mon Sep 17 00:00:00 2001 From: Bart Trojanowski Date: Fri, 7 Jul 2006 18:01:49 -0400 Subject: [PATCH] Removing a left over '#else' that split another '#if/#endif' block in two. This caused the tailroom calculation in ipsec_xmit_encap_once() to cause headroom issues when the ESP padding under certain packet sizes. --- net/ipsec/ipsec_xmit.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/net/ipsec/ipsec_xmit.c b/net/ipsec/ipsec_xmit.c index 90de9f9..59b6437 100644 --- a/net/ipsec/ipsec_xmit.c +++ b/net/ipsec/ipsec_xmit.c @@ -558,8 +558,6 @@ #endif /* CONFIG_KLIPS_AUTH_HMAC_SHA1 */ tailroom += blocksize != 1 ? ((blocksize - ((ixs->pyldsz + 2) % blocksize)) % blocksize) + 2 : ((4 - ((ixs->pyldsz + 2) % 4)) % 4) + 2; -#else - tailroom += ((8 - ((ixs->pyldsz + 2 * sizeof(unsigned char)) % 8)) % 8) + 2; tailroom += authlen; break; #endif /* CONFIG_KLIPS_ESP */ -- 1.4.0