openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: remove inline on static in c file 

remove __inline__ / inline and let compiler decide what to do
with static functions

Inspired-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fabian Frederick 2014-10-29 11:38:17 +01:00 committed by David S. Miller
parent 40dc2ca3cb
commit fc08c25819
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv6/reassembly.c
View File

@ -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)
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)
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