Revert "ipv4: tcp: dont cache unconfirmed intput dst"

This reverts commit c074da2810c118b3812f32d6754bd9ead2f169e7.

This change has several unwanted side effects:

1) Sockets will cache the DST_NOCACHE route in sk->sk_rx_dst and we'll
   thus never create a real cached route.

2) All TCP traffic will use DST_NOCACHE and never use the routing
   cache at all.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 5 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index fdc7900f9d7a..81533e3a23d1 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2214,7 +2214,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
  */
 
 static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
-                               u8 tos, struct net_device *dev, bool nocache)
+                               u8 tos, struct net_device *dev)
 {
         struct fib_result res;
         struct in_device *in_dev = __in_dev_get_rcu(dev);
@@ -2353,8 +2353,6 @@ local_input:
                 rth->dst.error= -err;
                 rth->rt_flags   &= ~RTCF_LOCAL;
         }
-        if (nocache)
-                rth->dst.flags |= DST_NOCACHE;
         hash = rt_hash(daddr, saddr, fl4.flowi4_iif, rt_genid(net));
         rth = rt_intern_hash(hash, rth, skb, fl4.flowi4_iif);
         err = 0;
@@ -2397,7 +2395,7 @@ martian_source_keep_err:
 }
 
 int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
-                           u8 tos, struct net_device *dev, bool noref, bool nocache)
+                           u8 tos, struct net_device *dev, bool noref)
 {
         struct rtable   *rth;
         unsigned int    hash;
@@ -2473,7 +2471,7 @@ skip_cache:
                 rcu_read_unlock();
                 return -EINVAL;
         }
-        res = ip_route_input_slow(skb, daddr, saddr, tos, dev, nocache);
+        res = ip_route_input_slow(skb, daddr, saddr, tos, dev);
         rcu_read_unlock();
         return res;
 }