Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IPV4: route inline changes

Don't mark functions that are large as inline, let compiler decide.
Also, use inline rather than __inline__.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller
5969f71d 43db6d65

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