From 62f823565c4b78060665b44a075c090aed8d4562 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 12 Jul 2012 09:39:28 -0700
Subject: [PATCH] --- yaml --- r: 315174 b: refs/heads/master c:
 391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/ip_fib.h | 1 -
 trunk/net/ipv4/fib_trie.c  | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 761546dbb491..0b4aa16c893d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10b0a7732e04aeb7e21fe7dc3b8249a3041eab28
+refs/heads/master: 391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f
diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h
index 000c4674e18e..e91fedd22db2 100644
--- a/trunk/include/net/ip_fib.h
+++ b/trunk/include/net/ip_fib.h
@@ -162,7 +162,6 @@ struct fib_table {
 	u32			tb_id;
 	int			tb_default;
 	int			tb_num_default;
-	struct inet_peer_base	tb_peers;
 	unsigned long		tb_data[0];
 };
 
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
index 9b0f25930fbc..18cbc15b20d5 100644
--- a/trunk/net/ipv4/fib_trie.c
+++ b/trunk/net/ipv4/fib_trie.c
@@ -1843,8 +1843,6 @@ int fib_table_flush(struct fib_table *tb)
 	if (ll && hlist_empty(&ll->list))
 		trie_leaf_remove(t, ll);
 
-	inetpeer_invalidate_tree(&tb->tb_peers);
-
 	pr_debug("trie_flush found=%d\n", found);
 	return found;
 }
@@ -1993,7 +1991,6 @@ struct fib_table *fib_trie_table(u32 id)
 	tb->tb_id = id;
 	tb->tb_default = -1;
 	tb->tb_num_default = 0;
-	inet_peer_base_init(&tb->tb_peers);
 
 	t = (struct trie *) tb->tb_data;
 	memset(t, 0, sizeof(*t));