diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-09-18 16:50:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-19 17:23:28 -0400 |
| commit | d4915c087f7c2457c580efc16fe0bfa1a576274d (patch) | |
| tree | 3502caff41521db74f97a9e13e09f43cc03eb0c1 | |
| parent | b836c99fd6c9dfe52a69fa0ba36ec918f80ce02a (diff) | |
| download | linux-3.10-d4915c087f7c2457c580efc16fe0bfa1a576274d.tar.gz linux-3.10-d4915c087f7c2457c580efc16fe0bfa1a576274d.tar.bz2 linux-3.10-d4915c087f7c2457c580efc16fe0bfa1a576274d.zip | |
ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Michal Kubeček <mkubecek@suse.cz>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/ipv6.h | 13 | ||||
| -rw-r--r-- | net/ipv6/reassembly.c | 10 |
2 files changed, 11 insertions, 12 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 81d4455f6e1..979bf6c1314 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -271,8 +271,17 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space, extern bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb); -int ip6_frag_nqueues(struct net *net); -int ip6_frag_mem(struct net *net); +#if IS_ENABLED(CONFIG_IPV6) +static inline int ip6_frag_nqueues(struct net *net) +{ + return net->ipv6.frags.nqueues; +} + +static inline int ip6_frag_mem(struct net *net) +{ + return atomic_read(&net->ipv6.frags.mem); +} +#endif #define IPV6_FRAG_HIGH_THRESH (256 * 1024) /* 262144 */ #define IPV6_FRAG_LOW_THRESH (192 * 1024) /* 196608 */ diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 0ee553354ed..cf74f4e7935 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -67,16 +67,6 @@ struct ip6frag_skb_cb static struct inet_frags ip6_frags; -int ip6_frag_nqueues(struct net *net) -{ - return net->ipv6.frags.nqueues; -} - -int ip6_frag_mem(struct net *net) -{ - return atomic_read(&net->ipv6.frags.mem); -} - static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, struct net_device *dev); |