Merge branch 'linux-2.6' into for-2.6.24

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 7a23e59c374a..39f6211f1496 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -46,7 +46,7 @@ static int ip_clear_mutable_options(struct iphdr *iph, __be32 *daddr)
                         memcpy(daddr, optptr+optlen-4, 4);
                         /* Fall through */
                 default:
-                        memset(optptr+2, 0, optlen-2);
+                        memset(optptr, 0, optlen);
                 }
                 l -= optlen;
                 optptr += optlen;