aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 230716c2dfe0..d758ea1d80f6 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -600,18 +600,18 @@ static inline int ip_rt_proc_init(void)
600} 600}
601#endif /* CONFIG_PROC_FS */ 601#endif /* CONFIG_PROC_FS */
602 602
603static __inline__ void rt_free(struct rtable *rt) 603static inline void rt_free(struct rtable *rt)
604{ 604{
605 call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free); 605 call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
606} 606}
607 607
608static __inline__ void rt_drop(struct rtable *rt) 608static inline void rt_drop(struct rtable *rt)
609{ 609{
610 ip_rt_put(rt); 610 ip_rt_put(rt);
611 call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free); 611 call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
612} 612}
613 613
614static __inline__ int rt_fast_clean(struct rtable *rth) 614static inline int rt_fast_clean(struct rtable *rth)
615{ 615{
616 /* Kill broadcast/multicast entries very aggresively, if they 616 /* Kill broadcast/multicast entries very aggresively, if they
617 collide in hash table with more useful entries */ 617 collide in hash table with more useful entries */
@@ -619,7 +619,7 @@ static __inline__ int rt_fast_clean(struct rtable *rth)
619 rth->fl.iif && rth->u.dst.rt_next; 619 rth->fl.iif && rth->u.dst.rt_next;
620} 620}
621 621
622static __inline__ int rt_valuable(struct rtable *rth) 622static inline int rt_valuable(struct rtable *rth)
623{ 623{
624 return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) || 624 return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) ||
625 rth->u.dst.expires; 625 rth->u.dst.expires;
@@ -1420,7 +1420,7 @@ out: kfree_skb(skb);
1420static const unsigned short mtu_plateau[] = 1420static const unsigned short mtu_plateau[] =
1421{32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 }; 1421{32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 };
1422 1422
1423static __inline__ unsigned short guess_mtu(unsigned short old_mtu) 1423static inline unsigned short guess_mtu(unsigned short old_mtu)
1424{ 1424{
1425 int i; 1425 int i;
1426 1426
@@ -1750,11 +1750,11 @@ static void ip_handle_martian_source(struct net_device *dev,
1750#endif 1750#endif
1751} 1751}
1752 1752
1753static inline int __mkroute_input(struct sk_buff *skb, 1753static int __mkroute_input(struct sk_buff *skb,
1754 struct fib_result* res, 1754 struct fib_result *res,
1755 struct in_device *in_dev, 1755 struct in_device *in_dev,
1756 __be32 daddr, __be32 saddr, u32 tos, 1756 __be32 daddr, __be32 saddr, u32 tos,
1757 struct rtable **result) 1757 struct rtable **result)
1758{ 1758{
1759 1759
1760 struct rtable *rth; 1760 struct rtable *rth;
@@ -1846,11 +1846,11 @@ static inline int __mkroute_input(struct sk_buff *skb,
1846 return err; 1846 return err;
1847} 1847}
1848 1848
1849static inline int ip_mkroute_input(struct sk_buff *skb, 1849static int ip_mkroute_input(struct sk_buff *skb,
1850 struct fib_result* res, 1850 struct fib_result *res,
1851 const struct flowi *fl, 1851 const struct flowi *fl,
1852 struct in_device *in_dev, 1852 struct in_device *in_dev,
1853 __be32 daddr, __be32 saddr, u32 tos) 1853 __be32 daddr, __be32 saddr, u32 tos)
1854{ 1854{
1855 struct rtable* rth = NULL; 1855 struct rtable* rth = NULL;
1856 int err; 1856 int err;
@@ -2132,12 +2132,12 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr,
2132 return ip_route_input_slow(skb, daddr, saddr, tos, dev); 2132 return ip_route_input_slow(skb, daddr, saddr, tos, dev);
2133} 2133}
2134 2134
2135static inline int __mkroute_output(struct rtable **result, 2135static int __mkroute_output(struct rtable **result,
2136 struct fib_result* res, 2136 struct fib_result *res,
2137 const struct flowi *fl, 2137 const struct flowi *fl,
2138 const struct flowi *oldflp, 2138 const struct flowi *oldflp,
2139 struct net_device *dev_out, 2139 struct net_device *dev_out,
2140 unsigned flags) 2140 unsigned flags)
2141{ 2141{
2142 struct rtable *rth; 2142 struct rtable *rth;
2143 struct in_device *in_dev; 2143 struct in_device *in_dev;
@@ -2252,12 +2252,12 @@ static inline int __mkroute_output(struct rtable **result,
2252 return err; 2252 return err;
2253} 2253}
2254 2254
2255static inline int ip_mkroute_output(struct rtable **rp, 2255static int ip_mkroute_output(struct rtable **rp,
2256 struct fib_result* res, 2256 struct fib_result *res,
2257 const struct flowi *fl, 2257 const struct flowi *fl,
2258 const struct flowi *oldflp, 2258 const struct flowi *oldflp,
2259 struct net_device *dev_out, 2259 struct net_device *dev_out,
2260 unsigned flags) 2260 unsigned flags)
2261{ 2261{
2262 struct rtable *rth = NULL; 2262 struct rtable *rth = NULL;
2263 int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags); 2263 int err = __mkroute_output(&rth, res, fl, oldflp, dev_out, flags);