diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-11-04 14:44:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-04 15:13:18 -0500 |
commit | aa1f731e52807077e9e13a86c0cad12d442c8fd4 (patch) | |
tree | 54fda01977f669f3197a6a7f66f9b5e2bfeff244 /net | |
parent | 0d3979b9c711bf823d65e8abe9ab2e8bff0669fa (diff) |
inet: frags: 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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ip_fragment.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 2811cc18701a..4d964dadd655 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -80,7 +80,7 @@ struct ipq { | |||
80 | struct inet_peer *peer; | 80 | struct inet_peer *peer; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static inline u8 ip4_frag_ecn(u8 tos) | 83 | static u8 ip4_frag_ecn(u8 tos) |
84 | { | 84 | { |
85 | return 1 << (tos & INET_ECN_MASK); | 85 | return 1 << (tos & INET_ECN_MASK); |
86 | } | 86 | } |
@@ -148,7 +148,7 @@ static void ip4_frag_init(struct inet_frag_queue *q, const void *a) | |||
148 | inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL; | 148 | inet_getpeer_v4(net->ipv4.peers, arg->iph->saddr, 1) : NULL; |
149 | } | 149 | } |
150 | 150 | ||
151 | static __inline__ void ip4_frag_free(struct inet_frag_queue *q) | 151 | static void ip4_frag_free(struct inet_frag_queue *q) |
152 | { | 152 | { |
153 | struct ipq *qp; | 153 | struct ipq *qp; |
154 | 154 | ||
@@ -160,7 +160,7 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q) | |||
160 | 160 | ||
161 | /* Destruction primitives. */ | 161 | /* Destruction primitives. */ |
162 | 162 | ||
163 | static __inline__ void ipq_put(struct ipq *ipq) | 163 | static void ipq_put(struct ipq *ipq) |
164 | { | 164 | { |
165 | inet_frag_put(&ipq->q, &ip4_frags); | 165 | inet_frag_put(&ipq->q, &ip4_frags); |
166 | } | 166 | } |
@@ -236,7 +236,7 @@ out: | |||
236 | /* Find the correct entry in the "incomplete datagrams" queue for | 236 | /* Find the correct entry in the "incomplete datagrams" queue for |
237 | * this IP datagram, and create new one, if nothing is found. | 237 | * this IP datagram, and create new one, if nothing is found. |
238 | */ | 238 | */ |
239 | static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) | 239 | static struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) |
240 | { | 240 | { |
241 | struct inet_frag_queue *q; | 241 | struct inet_frag_queue *q; |
242 | struct ip4_create_arg arg; | 242 | struct ip4_create_arg arg; |
@@ -256,7 +256,7 @@ static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) | |||
256 | } | 256 | } |
257 | 257 | ||
258 | /* Is the fragment too far ahead to be part of ipq? */ | 258 | /* Is the fragment too far ahead to be part of ipq? */ |
259 | static inline int ip_frag_too_far(struct ipq *qp) | 259 | static int ip_frag_too_far(struct ipq *qp) |
260 | { | 260 | { |
261 | struct inet_peer *peer = qp->peer; | 261 | struct inet_peer *peer = qp->peer; |
262 | unsigned int max = sysctl_ipfrag_max_dist; | 262 | unsigned int max = sysctl_ipfrag_max_dist; |
@@ -795,16 +795,16 @@ static void __init ip4_frags_ctl_register(void) | |||
795 | register_net_sysctl(&init_net, "net/ipv4", ip4_frags_ctl_table); | 795 | register_net_sysctl(&init_net, "net/ipv4", ip4_frags_ctl_table); |
796 | } | 796 | } |
797 | #else | 797 | #else |
798 | static inline int ip4_frags_ns_ctl_register(struct net *net) | 798 | static int ip4_frags_ns_ctl_register(struct net *net) |
799 | { | 799 | { |
800 | return 0; | 800 | return 0; |
801 | } | 801 | } |
802 | 802 | ||
803 | static inline void ip4_frags_ns_ctl_unregister(struct net *net) | 803 | static void ip4_frags_ns_ctl_unregister(struct net *net) |
804 | { | 804 | { |
805 | } | 805 | } |
806 | 806 | ||
807 | static inline void __init ip4_frags_ctl_register(void) | 807 | static void __init ip4_frags_ctl_register(void) |
808 | { | 808 | { |
809 | } | 809 | } |
810 | #endif | 810 | #endif |