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

Commit cbc264ca authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ip_frag: struct inet_frags match() method returns a bool 



- match() method returns a boolean
- return (A && B && C && D) -> return A && B && C && D
- fix indentation

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
parent 28e85100

include/net/inet_frag.h

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ struct inet_frags { 
						void *arg);

	void			(*destructor)(struct inet_frag_queue *);

	void			(*skb_free)(struct sk_buff *);

	int			(*match)(struct inet_frag_queue *q,

						void *arg);

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

	void			(*frag_expire)(unsigned long data);

};

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ struct ip6_create_arg { 
};



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

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

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



static inline int ipv6_addr_any(const struct in6_addr *a)

{

net/ipv4/ip_fragment.c

+5 −5
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q) 
	return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol);

}



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

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

{

	struct ipq *qp;

	struct ip4_create_arg *arg = a;

net/ipv6/reassembly.c

+5 −4
Original line number Diff line number Diff line
@@ -134,15 +134,16 @@ static unsigned int ip6_hashfn(struct inet_frag_queue *q) 
	return inet6_hash_frag(fq->id, &fq->saddr, &fq->daddr, ip6_frags.rnd);

}



int ip6_frag_match(struct inet_frag_queue *q, void *a)

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

{

	struct frag_queue *fq;

	struct ip6_create_arg *arg = a;



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

	return (fq->id == arg->id && fq->user == arg->user &&

	return	fq->id == arg->id &&

		fq->user == arg->user &&

		ipv6_addr_equal(&fq->saddr, arg->src) &&

			ipv6_addr_equal(&fq->daddr, arg->dst));

		ipv6_addr_equal(&fq->daddr, arg->dst);

}

EXPORT_SYMBOL(ip6_frag_match);