diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-27 17:05:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-27 17:05:06 -0700 |
| commit | c10237e077cef50e925f052e49f3b4fead9d71f9 (patch) | |
| tree | 5b7418f3a31165ea2e7d119782cad0745cd45792 /net/ipv4/xfrm4_input.c | |
| parent | e440cf2ca0a1b075c64016240d46c3aa9d877bbf (diff) | |
| download | lwn-c10237e077cef50e925f052e49f3b4fead9d71f9.tar.gz lwn-c10237e077cef50e925f052e49f3b4fead9d71f9.zip | |
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/xfrm4_input.c')
| -rw-r--r-- | net/ipv4/xfrm4_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c index eee636b191b9..06814b6216dc 100644 --- a/net/ipv4/xfrm4_input.c +++ b/net/ipv4/xfrm4_input.c @@ -28,7 +28,7 @@ static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb) const struct iphdr *iph = ip_hdr(skb); if (ip_route_input_noref(skb, iph->daddr, iph->saddr, - iph->tos, skb->dev, false)) + iph->tos, skb->dev)) goto drop; } return dst_input(skb); |