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

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / ip_input.c

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 7be54c8dcbe2276f202e5d686dfd531bfc1c9fcb..2a39204de5bc0236933da71c4ed530292d71f086 100644 (file)
--- 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),