summaryrefslogtreecommitdiffstats
path: root/net/ipv4/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-02 00:15:39 +0100
committerDavid S. Miller <davem@davemloft.net>2011-02-02 00:35:25 +0100
commit3630b7c050d9c3564f143d595339fc06b888d6f3 (patch)
tree6c6144205d92e745303d79d136b0baed4b385193 /net/ipv4/Makefile
parentbnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x (diff)
downloadlinux-3630b7c050d9c3564f143d595339fc06b888d6f3.tar.xz
linux-3630b7c050d9c3564f143d595339fc06b888d6f3.zip
ipv4: Remove fib_hash.
The time has finally come to remove the hash based routing table implementation in ipv4. FIB Trie is mature, well tested, and I've done an audit of it's code to confirm that it implements insert, delete, and lookup with the same identical semantics as fib_hash did. If there are any semantic differences found in fib_trie, we should simply fix them. I've placed the trie statistic config option under advanced router configuration. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Diffstat (limited to 'net/ipv4/Makefile')
-rw-r--r--net/ipv4/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
index 4978d22f9a75..0dc772d0d125 100644
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
@@ -10,12 +10,10 @@ obj-y := route.o inetpeer.o protocol.o \
tcp_minisocks.o tcp_cong.o \
datagram.o raw.o udp.o udplite.o \
arp.o icmp.o devinet.o af_inet.o igmp.o \
- fib_frontend.o fib_semantics.o \
+ fib_frontend.o fib_semantics.o fib_trie.o \
inet_fragment.o
obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
-obj-$(CONFIG_IP_FIB_HASH) += fib_hash.o
-obj-$(CONFIG_IP_FIB_TRIE) += fib_trie.o
obj-$(CONFIG_PROC_FS) += proc.o
obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o
obj-$(CONFIG_IP_MROUTE) += ipmr.o