Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c77782 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

inet: frag: constify match, hashfn and constructor arguments 



Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac3d2e5a

include/net/inet_frag.h

+6 −5
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ struct inet_frags { 
	u32			rnd;

	int			qsize;



	unsigned int		(*hashfn)(struct inet_frag_queue *);

	bool			(*match)(struct inet_frag_queue *q, void *arg);

	unsigned int		(*hashfn)(const struct inet_frag_queue *);

	bool			(*match)(const struct inet_frag_queue *q,

					 const void *arg);

	void			(*constructor)(struct inet_frag_queue *q,

						void *arg);

					       const void *arg);

	void			(*destructor)(struct inet_frag_queue *);

	void			(*skb_free)(struct sk_buff *);

	void			(*frag_expire)(unsigned long data);
@@ -131,9 +132,9 @@ static inline void init_frag_mem_limit(struct netns_frags *nf) 
	percpu_counter_init(&nf->mem, 0);

}



static inline int sum_frag_mem_limit(struct netns_frags *nf)

static inline unsigned int sum_frag_mem_limit(struct netns_frags *nf)

{

	int res;

	unsigned int res;



	local_bh_disable();

	res = percpu_counter_sum_positive(&nf->mem);

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -496,8 +496,8 @@ struct ip6_create_arg { 
	u8 ecn;

};



void ip6_frag_init(struct inet_frag_queue *q, void *a);

bool ip6_frag_match(struct inet_frag_queue *q, void *a);

void ip6_frag_init(struct inet_frag_queue *q, const void *a);

bool ip6_frag_match(const struct inet_frag_queue *q, const void *a);



/*

 *	Equivalent of ipv4 struct ip

net/ieee802154/reassembly.c

+7 −7
Original line number Diff line number Diff line
@@ -61,18 +61,18 @@ static unsigned int lowpan_hash_frag(__be16 tag, u16 d_size, 
	return c & (INETFRAGS_HASHSZ - 1);

}



static unsigned int lowpan_hashfn(struct inet_frag_queue *q)

static unsigned int lowpan_hashfn(const struct inet_frag_queue *q)

{

	struct lowpan_frag_queue *fq;

	const struct lowpan_frag_queue *fq;



	fq = container_of(q, struct lowpan_frag_queue, q);

	return lowpan_hash_frag(fq->tag, fq->d_size, &fq->saddr, &fq->daddr);

}



static bool lowpan_frag_match(struct inet_frag_queue *q, void *a)

static bool lowpan_frag_match(const struct inet_frag_queue *q, const void *a)

{

	struct lowpan_frag_queue *fq;

	struct lowpan_create_arg *arg = a;

	const struct lowpan_frag_queue *fq;

	const struct lowpan_create_arg *arg = a;



	fq = container_of(q, struct lowpan_frag_queue, q);

	return	fq->tag == arg->tag && fq->d_size == arg->d_size &&
@@ -80,10 +80,10 @@ static bool lowpan_frag_match(struct inet_frag_queue *q, void *a) 
		ieee802154_addr_equal(&fq->daddr, arg->dst);

}



static void lowpan_frag_init(struct inet_frag_queue *q, void *a)

static void lowpan_frag_init(struct inet_frag_queue *q, const void *a)

{

	const struct lowpan_create_arg *arg = a;

	struct lowpan_frag_queue *fq;

	struct lowpan_create_arg *arg = a;



	fq = container_of(q, struct lowpan_frag_queue, q);

net/ipv4/ip_fragment.c

+7 −7
Original line number Diff line number Diff line
@@ -112,18 +112,18 @@ static unsigned int ipqhashfn(__be16 id, __be32 saddr, __be32 daddr, u8 prot) 
			    ip4_frags.rnd) & (INETFRAGS_HASHSZ - 1);

}



static unsigned int ip4_hashfn(struct inet_frag_queue *q)

static unsigned int ip4_hashfn(const struct inet_frag_queue *q)

{

	struct ipq *ipq;

	const struct ipq *ipq;



	ipq = container_of(q, struct ipq, q);

	return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol);

}



static bool ip4_frag_match(struct inet_frag_queue *q, void *a)

static bool ip4_frag_match(const struct inet_frag_queue *q, const void *a)

{

	struct ipq *qp;

	struct ip4_create_arg *arg = a;

	const struct ipq *qp;

	const struct ip4_create_arg *arg = a;



	qp = container_of(q, struct ipq, q);

	return	qp->id == arg->iph->id &&
@@ -133,14 +133,14 @@ static bool ip4_frag_match(struct inet_frag_queue *q, void *a) 
		qp->user == arg->user;

}



static void ip4_frag_init(struct inet_frag_queue *q, void *a)

static void ip4_frag_init(struct inet_frag_queue *q, const void *a)

{

	struct ipq *qp = container_of(q, struct ipq, q);

	struct netns_ipv4 *ipv4 = container_of(q->net, struct netns_ipv4,

					       frags);

	struct net *net = container_of(ipv4, struct net, ipv4);



	struct ip4_create_arg *arg = a;

	const struct ip4_create_arg *arg = a;



	qp->protocol = arg->iph->protocol;

	qp->id = arg->iph->id;

net/ipv6/netfilter/nf_conntrack_reasm.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static unsigned int nf_hash_frag(__be32 id, const struct in6_addr *saddr, 
}





static unsigned int nf_hashfn(struct inet_frag_queue *q)

static unsigned int nf_hashfn(const struct inet_frag_queue *q)

{

	const struct frag_queue *nq;