summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-09-18 18:50:10 +0200
committerDavid S. Miller <davem@davemloft.net>2012-09-19 23:23:28 +0200
commitd4915c087f7c2457c580efc16fe0bfa1a576274d (patch)
tree3502caff41521db74f97a9e13e09f43cc03eb0c1 /include/net
parentipv6: unify conntrack reassembly expire code with standard one (diff)
downloadlinux-d4915c087f7c2457c580efc16fe0bfa1a576274d.tar.xz
linux-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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ipv6.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 81d4455f6e14..979bf6c13141 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 */