From a77cc1df33dfb735e87377d2e6073fd8a2ad0917 Mon Sep 17 00:00:00 2001
From: Leigh Brown <leigh@solinno.co.uk>
Date: Sun, 17 Dec 2006 17:12:30 -0800
Subject: [PATCH] --- yaml --- r: 44669 b: refs/heads/master c:
 8228a18dd30f5c988b722495ea6c25cb1d2be035 h: refs/heads/master i:   44667:
 771203246fd93ab3de753d165228b1b8a1d78227 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_ipv4.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e3474430b98e..77fa6830a8be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8172d822fb02d5c4f7508e41f9267428dd3d891
+refs/heads/master: 8228a18dd30f5c988b722495ea6c25cb1d2be035
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index a1222d6968c4..fa814fc506d5 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/net/ipv4/tcp_ipv4.c
@@ -928,6 +928,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
 			if (tp->md5sig_info->entries4 == 0) {
 				kfree(tp->md5sig_info->keys4);
 				tp->md5sig_info->keys4 = NULL;
+				tp->md5sig_info->alloced4 = 0;
 			} else if (tp->md5sig_info->entries4 != i) {
 				/* Need to do some manipulation */
 				memcpy(&tp->md5sig_info->keys4[i],