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 /include/net | |
| parent | 89aef8921bfbac22f00e04f8450f6e447db13e42 (diff) | |
| download | linux-38a424e4657462fe9f8b76f01a0e879abde99ab4.tar.gz linux-38a424e4657462fe9f8b76f01a0e879abde99ab4.tar.bz2 linux-38a424e4657462fe9f8b76f01a0e879abde99ab4.zip | |
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 'include/net')
| -rw-r--r-- | include/net/route.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/net/route.h b/include/net/route.h index 5dcfeb621e06..5c86c4773b2b 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -160,20 +160,8 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4 return ip_route_output_key(net, fl4); } -extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, - u8 tos, struct net_device *devin, bool noref); - -static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src, - u8 tos, struct net_device *devin) -{ - return ip_route_input_common(skb, dst, src, tos, devin, false); -} - -static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src, - u8 tos, struct net_device *devin) -{ - return ip_route_input_common(skb, dst, src, tos, devin, true); -} +extern int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src, + u8 tos, struct net_device *devin); extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, int oif, u32 mark, u8 protocol, int flow_flags); |