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 /include/net/route.h | |
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 'include/net/route.h')
-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 | |||
160 | return ip_route_output_key(net, fl4); | 160 | return ip_route_output_key(net, fl4); |
161 | } | 161 | } |
162 | 162 | ||
163 | extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, | 163 | extern int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src, |
164 | u8 tos, struct net_device *devin, bool noref); | 164 | u8 tos, struct net_device *devin); |
165 | |||
166 | static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src, | ||
167 | u8 tos, struct net_device *devin) | ||
168 | { | ||
169 | return ip_route_input_common(skb, dst, src, tos, devin, false); | ||
170 | } | ||
171 | |||
172 | static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src, | ||
173 | u8 tos, struct net_device *devin) | ||
174 | { | ||
175 | return ip_route_input_common(skb, dst, src, tos, devin, true); | ||
176 | } | ||
177 | 165 | ||
178 | extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, | 166 | extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, |
179 | int oif, u32 mark, u8 protocol, int flow_flags); | 167 | int oif, u32 mark, u8 protocol, int flow_flags); |