From 5de1bed5b4525f4a41d4c6d9ecd9c5359b7c74fe Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Thu, 9 Aug 2012 11:19:13 +0200
Subject: [PATCH] --- yaml --- r: 321580 b: refs/heads/master c:
 36471012e2ae28ca3178f84d4687a2d88a36593e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a832fe9a065f..2344f5e9a737 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5addb91d14e63beb6224a62fb81b6e610cee3bc
+refs/heads/master: 36471012e2ae28ca3178f84d4687a2d88a36593e
diff --git a/trunk/net/ipv4/tcp_metrics.c b/trunk/net/ipv4/tcp_metrics.c
index 2288a6399e1e..0abe67bb4d3a 100644
--- a/trunk/net/ipv4/tcp_metrics.c
+++ b/trunk/net/ipv4/tcp_metrics.c
@@ -731,6 +731,18 @@ static int __net_init tcp_net_metrics_init(struct net *net)
 
 static void __net_exit tcp_net_metrics_exit(struct net *net)
 {
+	unsigned int i;
+
+	for (i = 0; i < (1U << net->ipv4.tcp_metrics_hash_log) ; i++) {
+		struct tcp_metrics_block *tm, *next;
+
+		tm = rcu_dereference_protected(net->ipv4.tcp_metrics_hash[i].chain, 1);
+		while (tm) {
+			next = rcu_dereference_protected(tm->tcpm_next, 1);
+			kfree(tm);
+			tm = next;
+		}
+	}
 	kfree(net->ipv4.tcp_metrics_hash);
 }