Commit aa1f731e authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller

inet: frags: remove inline on static in c file

remove __inline__ / inline and let compiler decide what to do
with static functions
Inspired-by: default avatar"David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d3979b9
...@@ -80,7 +80,7 @@ struct ipq { ...@@ -80,7 +80,7 @@ struct ipq {
struct inet_peer *peer; struct inet_peer *peer;
}; };
static inline u8 ip4_frag_ecn(u8 tos) static u8 ip4_frag_ecn(u8 tos)
{ {
return 1 << (tos & INET_ECN_MASK); return 1 << (tos & INET_ECN_MASK);
} }
...@@ -148,7 +148,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a) ...@@ -148,7 +148,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a)
inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL; inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL;
} }
static __inline__ void ip4_frag_free(struct inet_frag_queue *q) static void ip4_frag_free(struct inet_frag_queue *q)
{ {
struct ipq *qp; struct ipq *qp;
...@@ -160,7 +160,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q) ...@@ -160,7 +160,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
/* Destruction primitives. */ /* Destruction primitives. */
static __inline__ void ipq_put(struct ipq *ipq) static void ipq_put(struct ipq *ipq)
{ {
inet_frag_put(&ipq->q, &ip4_frags); inet_frag_put(&ipq->q, &ip4_frags);
} }
...@@ -236,7 +236,7 @@ static void ip_expire(unsigned long arg) ...@@ -236,7 +236,7 @@ static void ip_expire(unsigned long arg)
/* Find the correct entry in the "incomplete datagrams" queue for /* Find the correct entry in the "incomplete datagrams" queue for
* this IP datagram, and create new one, if nothing is found. * this IP datagram, and create new one, if nothing is found.
*/ */
static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) static struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user)
{ {
struct inet_frag_queue *q; struct inet_frag_queue *q;
struct ip4_create_arg arg; struct ip4_create_arg arg;
...@@ -256,7 +256,7 @@ static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) ...@@ -256,7 +256,7 @@ static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user)
} }
/* Is the fragment too far ahead to be part of ipq? */ /* Is the fragment too far ahead to be part of ipq? */
static inline int ip_frag_too_far(struct ipq *qp) static int ip_frag_too_far(struct ipq *qp)
{ {
struct inet_peer *peer = qp->peer; struct inet_peer *peer = qp->peer;
unsigned int max = sysctl_ipfrag_max_dist; unsigned int max = sysctl_ipfrag_max_dist;
...@@ -795,16 +795,16 @@ static void __init ip4_frags_ctl_register(void) ...@@ -795,16 +795,16 @@ static void __init ip4_frags_ctl_register(void)
register_net_sysctl(&init_net, "net/ipv4", ip4_frags_ctl_table); register_net_sysctl(&init_net, "net/ipv4", ip4_frags_ctl_table);
} }
#else #else
static inline int ip4_frags_ns_ctl_register(struct net *net) static int ip4_frags_ns_ctl_register(struct net *net)
{ {
return 0; return 0;
} }
static inline void ip4_frags_ns_ctl_unregister(struct net *net) static void ip4_frags_ns_ctl_unregister(struct net *net)
{ {
} }
static inline void __init ip4_frags_ctl_register(void) static void __init ip4_frags_ctl_register(void)
{ {
} }
#endif #endif
......
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