Skip to content

L
linux-davinci
Commit 5969f71d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files
Options

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43db6d65
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
net/ipv4/route.c
View file @ 5969f71d
...@@ -600,18 +600,18 @@ static inline int ip_rt_proc_init(void) ...@@ -600,18 +600,18 @@ static inline int ip_rt_proc_init(void)
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
static __inline__ void rt_free(struct rtable *rt) static inline void rt_free(struct rtable *rt)
{ {
call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free); call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
} }
static __inline__ void rt_drop(struct rtable *rt) static inline void rt_drop(struct rtable *rt)
{ {
ip_rt_put(rt); ip_rt_put(rt);
call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free); call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
} }
static __inline__ int rt_fast_clean(struct rtable *rth) static inline int rt_fast_clean(struct rtable *rth)
{ {
/* Kill broadcast/multicast entries very aggresively, if they /* Kill broadcast/multicast entries very aggresively, if they
collide in hash table with more useful entries */ collide in hash table with more useful entries */
...@@ -619,7 +619,7 @@ static __inline__ int rt_fast_clean(struct rtable *rth) ...@@ -619,7 +619,7 @@ static __inline__ int rt_fast_clean(struct rtable *rth)
rth->fl.iif && rth->u.dst.rt_next; rth->fl.iif && rth->u.dst.rt_next;
} }
static __inline__ int rt_valuable(struct rtable *rth) static inline int rt_valuable(struct rtable *rth)
{ {
return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) || return (rth->rt_flags & (RTCF_REDIRECTED | RTCF_NOTIFY)) ||
rth->u.dst.expires; rth->u.dst.expires;
...@@ -1420,7 +1420,7 @@ out: kfree_skb(skb); ...@@ -1420,7 +1420,7 @@ out: kfree_skb(skb);
static const unsigned short mtu_plateau[] = static const unsigned short mtu_plateau[] =
{32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 }; {32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 };
static __inline__ unsigned short guess_mtu(unsigned short old_mtu) static inline unsigned short guess_mtu(unsigned short old_mtu)
{ {
int i; int i;
...@@ -1750,8 +1750,8 @@ static void ip_handle_martian_source(struct net_device *dev, ...@@ -1750,8 +1750,8 @@ static void ip_handle_martian_source(struct net_device *dev,
#endif #endif
} }
static inline int __mkroute_input(struct sk_buff *skb, static int __mkroute_input(struct sk_buff *skb,
struct fib_result* res, struct fib_result *res,
struct in_device *in_dev, struct in_device *in_dev,
__be32 daddr, __be32 saddr, u32 tos, __be32 daddr, __be32 saddr, u32 tos,
struct rtable **result) struct rtable **result)
...@@ -1846,8 +1846,8 @@ static inline int __mkroute_input(struct sk_buff *skb, ...@@ -1846,8 +1846,8 @@ static inline int __mkroute_input(struct sk_buff *skb,
return err; return err;
} }
static inline int ip_mkroute_input(struct sk_buff *skb, static int ip_mkroute_input(struct sk_buff *skb,
struct fib_result* res, struct fib_result *res,
const struct flowi *fl, const struct flowi *fl,
struct in_device *in_dev, struct in_device *in_dev,
__be32 daddr, __be32 saddr, u32 tos) __be32 daddr, __be32 saddr, u32 tos)
...@@ -2132,8 +2132,8 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr, ...@@ -2132,8 +2132,8 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr,
return ip_route_input_slow(skb, daddr, saddr, tos, dev); return ip_route_input_slow(skb, daddr, saddr, tos, dev);
} }
static inline int __mkroute_output(struct rtable **result, static int __mkroute_output(struct rtable **result,
struct fib_result* res, struct fib_result *res,
const struct flowi *fl, const struct flowi *fl,
const struct flowi *oldflp, const struct flowi *oldflp,
struct net_device *dev_out, struct net_device *dev_out,
...@@ -2252,8 +2252,8 @@ static inline int __mkroute_output(struct rtable **result, ...@@ -2252,8 +2252,8 @@ static inline int __mkroute_output(struct rtable **result,
return err; return err;
} }
static inline int ip_mkroute_output(struct rtable **rp, static int ip_mkroute_output(struct rtable **rp,
struct fib_result* res, struct fib_result *res,
const struct flowi *fl, const struct flowi *fl,
const struct flowi *oldflp, const struct flowi *oldflp,
struct net_device *dev_out, struct net_device *dev_out,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment