summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-27 17:05:06 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-27 17:05:06 -0700
commitc10237e077cef50e925f052e49f3b4fead9d71f9 (patch)
tree5b7418f3a31165ea2e7d119782cad0745cd45792 /net/ipv4/tcp_ipv4.c
parente440cf2ca0a1b075c64016240d46c3aa9d877bbf (diff)
downloadop-kernel-dev-c10237e077cef50e925f052e49f3b4fead9d71f9.zip
op-kernel-dev-c10237e077cef50e925f052e49f3b4fead9d71f9.tar.gz
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>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 33aabd4..1781dc6 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1673,7 +1673,7 @@ csum_err:
}
EXPORT_SYMBOL(tcp_v4_do_rcv);
-int tcp_v4_early_demux(struct sk_buff *skb, bool *no_dst_cache)
+int tcp_v4_early_demux(struct sk_buff *skb)
{
struct net *net = dev_net(skb->dev);
const struct iphdr *iph;
@@ -1719,8 +1719,6 @@ int tcp_v4_early_demux(struct sk_buff *skb, bool *no_dst_cache)
}
}
}
- } else {
- *no_dst_cache = true;
}
out_err:
OpenPOWER on IntegriCloud