Commit 5969f71d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

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

net/ipv4/route.c

+27 −27
Original line number Diff line number Diff line
@@ -600,18 +600,18 @@ static inline int ip_rt_proc_init(void) 
}

#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);

}



static __inline__ void rt_drop(struct rtable *rt)

static inline void rt_drop(struct rtable *rt)

{

	ip_rt_put(rt);

	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

	   collide in hash table with more useful entries */
@@ -619,7 +619,7 @@ static __inline__ int rt_fast_clean(struct rtable *rth) 
		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)) ||

		rth->u.dst.expires;
@@ -1420,7 +1420,7 @@ out: kfree_skb(skb); 
static const unsigned short mtu_plateau[] =

{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;
@@ -1750,7 +1750,7 @@ static void ip_handle_martian_source(struct net_device *dev, 
#endif

}



static inline int __mkroute_input(struct sk_buff *skb,

static int __mkroute_input(struct sk_buff *skb,

			   struct fib_result *res,

			   struct in_device *in_dev,

			   __be32 daddr, __be32 saddr, u32 tos,
@@ -1846,7 +1846,7 @@ static inline int __mkroute_input(struct sk_buff *skb, 
	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,

			    const struct flowi *fl,

			    struct in_device *in_dev,
@@ -2132,7 +2132,7 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	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,

			    const struct flowi *fl,

			    const struct flowi *oldflp,
@@ -2252,7 +2252,7 @@ static inline int __mkroute_output(struct rtable **result, 
	return err;

}



static inline int ip_mkroute_output(struct rtable **rp,

static int ip_mkroute_output(struct rtable **rp,

			     struct fib_result *res,

			     const struct flowi *fl,

			     const struct flowi *oldflp,