提交 fc08c258 编写于 作者: F Fabian Frederick 提交者: David S. Miller

ipv6: remove inline on static in c file

remove __inline__ / inline and let compiler decide what to do
with static functions
Inspired-by: N"David S. Miller" <davem@davemloft.net>
Signed-off-by: NFabian Frederick <fabf@skynet.be>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 40dc2ca3
...@@ -69,7 +69,7 @@ struct ip6frag_skb_cb { ...@@ -69,7 +69,7 @@ struct ip6frag_skb_cb {
#define FRAG6_CB(skb) ((struct ip6frag_skb_cb *)((skb)->cb)) #define FRAG6_CB(skb) ((struct ip6frag_skb_cb *)((skb)->cb))
static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h) static u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h)
{ {
return 1 << (ipv6_get_dsfield(ipv6h) & INET_ECN_MASK); return 1 << (ipv6_get_dsfield(ipv6h) & INET_ECN_MASK);
} }
...@@ -178,7 +178,7 @@ static void ip6_frag_expire(unsigned long data) ...@@ -178,7 +178,7 @@ static void ip6_frag_expire(unsigned long data)
ip6_expire_frag_queue(net, fq, &ip6_frags); ip6_expire_frag_queue(net, fq, &ip6_frags);
} }
static __inline__ struct frag_queue * static struct frag_queue *
fq_find(struct net *net, __be32 id, const struct in6_addr *src, fq_find(struct net *net, __be32 id, const struct in6_addr *src,
const struct in6_addr *dst, u8 ecn) const struct in6_addr *dst, u8 ecn)
{ {
...@@ -684,21 +684,21 @@ static void ip6_frags_sysctl_unregister(void) ...@@ -684,21 +684,21 @@ static void ip6_frags_sysctl_unregister(void)
unregister_net_sysctl_table(ip6_ctl_header); unregister_net_sysctl_table(ip6_ctl_header);
} }
#else #else
static inline int ip6_frags_ns_sysctl_register(struct net *net) static int ip6_frags_ns_sysctl_register(struct net *net)
{ {
return 0; return 0;
} }
static inline void ip6_frags_ns_sysctl_unregister(struct net *net) static void ip6_frags_ns_sysctl_unregister(struct net *net)
{ {
} }
static inline int ip6_frags_sysctl_register(void) static int ip6_frags_sysctl_register(void)
{ {
return 0; return 0;
} }
static inline void ip6_frags_sysctl_unregister(void) static void ip6_frags_sysctl_unregister(void)
{ {
} }
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册