summaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_input.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2012-07-01 02:02:53 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-20 13:30:59 -0700
commit38a424e4657462fe9f8b76f01a0e879abde99ab4 (patch)
tree3e5df29e768eb1fff1f9ebbc5cf7538d798a5535 /net/ipv4/xfrm4_input.c
parent89aef8921bfbac22f00e04f8450f6e447db13e42 (diff)
downloadlinux-38a424e4657462fe9f8b76f01a0e879abde99ab4.tar.bz2
ipv4: Kill ip_route_input_noref().
The "noref" argument to ip_route_input_common() is now always ignored because we do not cache routes, and in that case we must always grab a reference to the resulting 'dst'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_input.c')
-rw-r--r--net/ipv4/xfrm4_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c
index 06814b6216dc..58d23a572509 100644
--- a/net/ipv4/xfrm4_input.c
+++ b/net/ipv4/xfrm4_input.c
@@ -27,8 +27,8 @@ static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb)
if (skb_dst(skb) == NULL) {
const struct iphdr *iph = ip_hdr(skb);
- if (ip_route_input_noref(skb, iph->daddr, iph->saddr,
- iph->tos, skb->dev))
+ if (ip_route_input(skb, iph->daddr, iph->saddr,
+ iph->tos, skb->dev))
goto drop;
}
return dst_input(skb);