[IPV4]: Remove IPVS icmp hack from route.c for now.
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 18 May 2007 09:07:50 +0000 (02:07 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 18 May 2007 09:07:50 +0000 (02:07 -0700)
Revert: 2d771cd86d4c3af26f34a7bcdc1b87696824cad9

This is dangerous if enabled and a better solution to the
problem is being worked on.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/route.c

index cb76e3c725a08581b7b0d1b62841bfb0ca775d04..df9fe4f2e8cc5df95fc43c3fe1c271d8d480ac89 100644 (file)
@@ -2396,7 +2396,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
 
                /* It is equivalent to inet_addr_type(saddr) == RTN_LOCAL */
                dev_out = ip_dev_find(oldflp->fl4_src);
-               if ((dev_out == NULL) && !(sysctl_ip_nonlocal_bind))
+               if (dev_out == NULL)
                        goto out;
 
                /* I removed check for oif == dev_out->oif here.
@@ -2407,7 +2407,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
                      of another iface. --ANK
                 */
 
-               if (dev_out && oldflp->oif == 0
+               if (oldflp->oif == 0
                    && (MULTICAST(oldflp->fl4_dst) || oldflp->fl4_dst == htonl(0xFFFFFFFF))) {
                        /* Special hack: user can direct multicasts
                           and limited broadcast via necessary interface