diff options
author | David Miller <davem@davemloft.net> | 2012-06-30 22:02:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-20 16:30:59 -0400 |
commit | 38a424e4657462fe9f8b76f01a0e879abde99ab4 (patch) | |
tree | 3e5df29e768eb1fff1f9ebbc5cf7538d798a5535 /net/ipv4/ip_input.c | |
parent | 89aef8921bfbac22f00e04f8450f6e447db13e42 (diff) |
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/ip_input.c')
-rw-r--r-- | net/ipv4/ip_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index b27d4440f523..4ebc6feee250 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c | |||
@@ -336,8 +336,8 @@ static int ip_rcv_finish(struct sk_buff *skb) | |||
336 | * how the packet travels inside Linux networking. | 336 | * how the packet travels inside Linux networking. |
337 | */ | 337 | */ |
338 | if (!skb_dst(skb)) { | 338 | if (!skb_dst(skb)) { |
339 | int err = ip_route_input_noref(skb, iph->daddr, iph->saddr, | 339 | int err = ip_route_input(skb, iph->daddr, iph->saddr, |
340 | iph->tos, skb->dev); | 340 | iph->tos, skb->dev); |
341 | if (unlikely(err)) { | 341 | if (unlikely(err)) { |
342 | if (err == -EXDEV) | 342 | if (err == -EXDEV) |
343 | NET_INC_STATS_BH(dev_net(skb->dev), | 343 | NET_INC_STATS_BH(dev_net(skb->dev), |