aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/route.h6
-rw-r--r--net/ipv4/route.c6
2 files changed, 5 insertions, 7 deletions
diff --git a/include/net/route.h b/include/net/route.h
index 088a1867348..60daf745216 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -119,11 +119,15 @@ extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
119extern void rt_cache_flush(struct net *net, int how); 119extern void rt_cache_flush(struct net *net, int how);
120extern void rt_cache_flush_batch(struct net *net); 120extern void rt_cache_flush_batch(struct net *net);
121extern struct rtable *__ip_route_output_key(struct net *, const struct flowi *flp); 121extern struct rtable *__ip_route_output_key(struct net *, const struct flowi *flp);
122extern struct rtable *ip_route_output_key(struct net *, struct flowi *flp);
123extern struct rtable *ip_route_output_flow(struct net *, struct flowi *flp, 122extern struct rtable *ip_route_output_flow(struct net *, struct flowi *flp,
124 struct sock *sk); 123 struct sock *sk);
125extern struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig); 124extern struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig);
126 125
126static inline struct rtable *ip_route_output_key(struct net *net, struct flowi *flp)
127{
128 return ip_route_output_flow(net, flp, NULL);
129}
130
127extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, 131extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
128 u8 tos, struct net_device *devin, bool noref); 132 u8 tos, struct net_device *devin, bool noref);
129 133
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 5090e956f6b..432eee64564 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2736,12 +2736,6 @@ struct rtable *ip_route_output_flow(struct net *net, struct flowi *flp,
2736} 2736}
2737EXPORT_SYMBOL_GPL(ip_route_output_flow); 2737EXPORT_SYMBOL_GPL(ip_route_output_flow);
2738 2738
2739struct rtable *ip_route_output_key(struct net *net, struct flowi *flp)
2740{
2741 return ip_route_output_flow(net, flp, NULL);
2742}
2743EXPORT_SYMBOL(ip_route_output_key);
2744
2745static int rt_fill_info(struct net *net, 2739static int rt_fill_info(struct net *net,
2746 struct sk_buff *skb, u32 pid, u32 seq, int event, 2740 struct sk_buff *skb, u32 pid, u32 seq, int event,
2747 int nowait, unsigned int flags) 2741 int nowait, unsigned int flags)