From f01f4fa448ec54e53ba4d66f9df905ec45abdac9 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 2 Mar 2011 14:56:30 -0800 Subject: [PATCH] --- yaml --- r: 237542 b: refs/heads/master c: 5bfa787fb2c29cce0722500f90df29e049ff07fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/route.h | 6 +++++- trunk/net/ipv4/route.c | 6 ------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1e98e69259d7..e52a9671b00d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b23dd4fe42b455af5c6e20966b7d6959fa8352ea +refs/heads/master: 5bfa787fb2c29cce0722500f90df29e049ff07fc diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h index 088a1867348f..60daf745216a 100644 --- a/trunk/include/net/route.h +++ b/trunk/include/net/route.h @@ -119,11 +119,15 @@ extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, extern void rt_cache_flush(struct net *net, int how); extern void rt_cache_flush_batch(struct net *net); extern struct rtable *__ip_route_output_key(struct net *, const struct flowi *flp); -extern struct rtable *ip_route_output_key(struct net *, struct flowi *flp); extern struct rtable *ip_route_output_flow(struct net *, struct flowi *flp, struct sock *sk); extern struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig); +static inline struct rtable *ip_route_output_key(struct net *net, struct flowi *flp) +{ + return ip_route_output_flow(net, flp, NULL); +} + extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, u8 tos, struct net_device *devin, bool noref); diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 5090e956f6b8..432eee645648 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -2736,12 +2736,6 @@ struct rtable *ip_route_output_flow(struct net *net, struct flowi *flp, } EXPORT_SYMBOL_GPL(ip_route_output_flow); -struct rtable *ip_route_output_key(struct net *net, struct flowi *flp) -{ - return ip_route_output_flow(net, flp, NULL); -} -EXPORT_SYMBOL(ip_route_output_key); - static int rt_fill_info(struct net *net, struct sk_buff *skb, u32 pid, u32 seq, int event, int nowait, unsigned int flags)