Commit d4915c08 authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

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: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b836c99f

include/net/ipv6.h

+11 −2
Original line number Diff line number Diff line
@@ -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 */

net/ipv6/reassembly.c

+0 −10
Original line number Diff line number Diff line
@@ -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);