diff options
author | David Miller <davem@davemloft.net> | 2012-07-01 02:02:53 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-20 13:30:59 -0700 |
commit | 38a424e4657462fe9f8b76f01a0e879abde99ab4 (patch) | |
tree | 3e5df29e768eb1fff1f9ebbc5cf7538d798a5535 /net/ipv4/ip_fragment.c | |
parent | 89aef8921bfbac22f00e04f8450f6e447db13e42 (diff) | |
download | op-kernel-dev-38a424e4657462fe9f8b76f01a0e879abde99ab4.zip op-kernel-dev-38a424e4657462fe9f8b76f01a0e879abde99ab4.tar.gz |
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_fragment.c')
-rw-r--r-- | net/ipv4/ip_fragment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 8d07c97..7ad88e5 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -258,8 +258,8 @@ static void ip_expire(unsigned long arg) /* skb dst is stale, drop it, and perform route lookup again */ skb_dst_drop(head); iph = ip_hdr(head); - err = ip_route_input_noref(head, iph->daddr, iph->saddr, - iph->tos, head->dev); + err = ip_route_input(head, iph->daddr, iph->saddr, + iph->tos, head->dev); if (err) goto out_rcu_unlock; |