diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-10-29 06:38:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-30 15:51:43 -0400 |
commit | fc08c258191f4acc79df232c0c65c857ee75e59f (patch) | |
tree | a55ffc15f296801cad020e869a1eaa9caf19b89d | |
parent | 40dc2ca3cb22666ecf8715a8c4ca0529148ecac8 (diff) |
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>
-rw-r--r-- | net/ipv6/reassembly.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 1a157ca2ebc1..51ab096ae574 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -69,7 +69,7 @@ struct ip6frag_skb_cb { | |||
69 | 69 | ||
70 | #define FRAG6_CB(skb) ((struct ip6frag_skb_cb *)((skb)->cb)) | 70 | #define FRAG6_CB(skb) ((struct ip6frag_skb_cb *)((skb)->cb)) |
71 | 71 | ||
72 | static inline u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h) | 72 | static u8 ip6_frag_ecn(const struct ipv6hdr *ipv6h) |
73 | { | 73 | { |
74 | return 1 << (ipv6_get_dsfield(ipv6h) & INET_ECN_MASK); | 74 | return 1 << (ipv6_get_dsfield(ipv6h) & INET_ECN_MASK); |
75 | } | 75 | } |
@@ -178,7 +178,7 @@ static void ip6_frag_expire(unsigned long data) | |||
178 | ip6_expire_frag_queue(net, fq, &ip6_frags); | 178 | ip6_expire_frag_queue(net, fq, &ip6_frags); |
179 | } | 179 | } |
180 | 180 | ||
181 | static __inline__ struct frag_queue * | 181 | static struct frag_queue * |
182 | fq_find(struct net *net, __be32 id, const struct in6_addr *src, | 182 | fq_find(struct net *net, __be32 id, const struct in6_addr *src, |
183 | const struct in6_addr *dst, u8 ecn) | 183 | const struct in6_addr *dst, u8 ecn) |
184 | { | 184 | { |
@@ -684,21 +684,21 @@ static void ip6_frags_sysctl_unregister(void) | |||
684 | unregister_net_sysctl_table(ip6_ctl_header); | 684 | unregister_net_sysctl_table(ip6_ctl_header); |
685 | } | 685 | } |
686 | #else | 686 | #else |
687 | static inline int ip6_frags_ns_sysctl_register(struct net *net) | 687 | static int ip6_frags_ns_sysctl_register(struct net *net) |
688 | { | 688 | { |
689 | return 0; | 689 | return 0; |
690 | } | 690 | } |
691 | 691 | ||
692 | static inline void ip6_frags_ns_sysctl_unregister(struct net *net) | 692 | static void ip6_frags_ns_sysctl_unregister(struct net *net) |
693 | { | 693 | { |
694 | } | 694 | } |
695 | 695 | ||
696 | static inline int ip6_frags_sysctl_register(void) | 696 | static int ip6_frags_sysctl_register(void) |
697 | { | 697 | { |
698 | return 0; | 698 | return 0; |
699 | } | 699 | } |
700 | 700 | ||
701 | static inline void ip6_frags_sysctl_unregister(void) | 701 | static void ip6_frags_sysctl_unregister(void) |
702 | { | 702 | { |
703 | } | 703 | } |
704 | #endif | 704 | #endif |