[IPV4]: Zap CONFIG_IP_ROUTE_TOS

These facilities are now available by default.
The config option makes no sense because:
1) It makes no change to the layout of any
   data structure, therefore it has no impact
   upon memory usage of the routing tables.
2) It makes no significant change to code size,
   only a handfull of lookup comparisons are
   protected by the option.
3) It is needed for full RFC1812 compliance anyways.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm/configs/ebsa110_defconfig b/arch/arm/configs/ebsa110_defconfig
index 2b1f60fdb8e61e58db6ded5589407c9f654637f2..68f4047fc309c86ddc7c5390fcb6d3ad38548893 100644 (file)
--- a/arch/arm/configs/ebsa110_defconfig
+++ b/arch/arm/configs/ebsa110_defconfig
@@ -176,7 +176,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_NAT=y
 # CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_TOS is not set
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set

diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
index 1933c70272f6d5cb1b5bf189a60406ae6a34f5a3..7b821f811a867bedfee4f99df6e58255250f4fdf 100644 (file)
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
@@ -308,7 +308,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_NAT=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index d942862ad81a955bfbcb8546bb0d89ba4c072662..9933eede8d9b88d7116b29ab7d141aba3d18b6e8 100644 (file)
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -272,7 +272,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_NAT=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set

diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index cd08e3c03df0f0cd3468c21ff836e6251e0b1ba0..5be7f568fa67cdc299464884ea0f211bff33af65 100644 (file)
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -229,7 +229,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_NAT=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index fc370970ba83dd57b88ac7a7d2bac4f539599b24..fcd6e674d41c86e00d6563526a2a7ec8f1371258 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -94,16 +94,6 @@ config IP_ROUTE_MULTIPATH
          equal "cost" and chooses one of them in a non-deterministic fashion
          if a matching packet arrives.
 
-config IP_ROUTE_TOS
-       bool "IP: use TOS value as routing key"
-       depends on IP_ADVANCED_ROUTER
-       help
-         The header of every IP packet carries a TOS (Type Of Service) value
-         with which the packet requests a certain treatment, e.g. low
-         latency (for interactive traffic), high throughput, or high
-         reliability.  If you say Y here, you will be able to specify
-         different routes for packets with different TOS values.
-
 config IP_ROUTE_VERBOSE
        bool "IP: verbose route monitoring"
        depends on IP_ADVANCED_ROUTER

diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 5bf7ecff72d701959fac0cb96ef15bf6355f6f6c..1737ce3a94878cc3c6212a2c8a294475071634a9 100644 (file)
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -270,11 +270,9 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result
                                continue;
 
                        list_for_each_entry(fa, &f->fn_alias, fa_list) {
-#ifdef CONFIG_IP_ROUTE_TOS
                                if (fa->fa_tos &&
                                    fa->fa_tos != flp->fl4_tos)
                                        continue;
-#endif
                                if (fa->fa_scope < flp->fl4_scope)
                                        continue;
 
@@ -443,10 +441,8 @@ static struct fib_alias *fib_find_alias(struct fib_node *fn, u8 tos, u32 prio)
 
                prev_fa = NULL;
                list_for_each_entry(fa, head, fa_list) {
-#ifdef CONFIG_IP_ROUTE_TOS
                        if (fa->fa_tos != tos)
                                continue;
-#endif
                        prev_fa = fa;
                        if (prio <= fa->fa_info->fib_priority)
                                break;
@@ -471,9 +467,6 @@ fn_hash_insert(struct fib_table *tb, struct rtmsg *r, struct kern_rta *rta,
        u32 key;
        int err;
 
-#ifndef CONFIG_IP_ROUTE_TOS
-       tos = 0;
-#endif
        if (z > 32)
                return -EINVAL;
        fz = table->fn_zones[z];
@@ -620,9 +613,6 @@ fn_hash_delete(struct fib_table *tb, struct rtmsg *r, struct kern_rta *rta,
        u32 key;
        u8 tos = r->rtm_tos;
 
-#ifndef CONFIG_IP_ROUTE_TOS
-       tos = 0;
-#endif
        if (z > 32)
                return -EINVAL;
        if ((fz  = table->fn_zones[z]) == NULL)

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index ad2481f8fa6839010f8343c1e44f09749e497207..ee19a7e7a881653a484e3b613bcfec8b5886dadf 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -302,9 +302,7 @@ FRprintk("Lookup: %u.%u.%u.%u <- %u.%u.%u.%u ",
        for (r = fib_rules; r; r=r->r_next) {
                if (((saddr^r->r_src) & r->r_srcmask) ||
                    ((daddr^r->r_dst) & r->r_dstmask) ||
-#ifdef CONFIG_IP_ROUTE_TOS
                    (r->r_tos && r->r_tos != flp->fl4_tos) ||
-#endif
 #ifdef CONFIG_IP_ROUTE_FWMARK
                    (r->r_fwmark && r->r_fwmark != flp->fl4_fwmark) ||
 #endif