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, 2 insertions, 3 deletions

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 7be54c8dcbe2..2a39204de5bc 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -326,7 +326,6 @@ static int ip_rcv_finish(struct sk_buff *skb)
          */
         if (skb_dst(skb) == NULL) {
                 int err = -ENOENT;
-                bool nocache = false;
 
                 if (sysctl_ip_early_demux) {
                         const struct net_protocol *ipprot;
@@ -335,13 +334,13 @@ static int ip_rcv_finish(struct sk_buff *skb)
                         rcu_read_lock();
                         ipprot = rcu_dereference(inet_protos[protocol]);
                         if (ipprot && ipprot->early_demux)
-                                err = ipprot->early_demux(skb, &nocache);
+                                err = ipprot->early_demux(skb);
                         rcu_read_unlock();
                 }
 
                 if (err) {
                         err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
-                                                   iph->tos, skb->dev, nocache);
+                                                   iph->tos, skb->dev);
                         if (unlikely(err)) {
                                 if (err == -EXDEV)
                                         NET_INC_STATS_BH(dev_net(skb->dev),