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

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
...@@ -46,8 +46,7 @@ struct inet_frags { ...@@ -46,8 +46,7 @@ struct inet_frags {
void *arg); void *arg);
void (*destructor)(struct inet_frag_queue *); void (*destructor)(struct inet_frag_queue *);
void (*skb_free)(struct sk_buff *); void (*skb_free)(struct sk_buff *);
int (*match)(struct inet_frag_queue *q, bool (*match)(struct inet_frag_queue *q, void *arg);
void *arg);
void (*frag_expire)(unsigned long data); void (*frag_expire)(unsigned long data);
}; };
......
...@@ -387,7 +387,7 @@ struct ip6_create_arg { ...@@ -387,7 +387,7 @@ struct ip6_create_arg {
}; };
void ip6_frag_init(struct inet_frag_queue *q, void *a); 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) static inline int ipv6_addr_any(const struct in6_addr *a)
{ {
......
...@@ -148,17 +148,17 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q) ...@@ -148,17 +148,17 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q)
return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol); 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 ipq *qp;
struct ip4_create_arg *arg = a; struct ip4_create_arg *arg = a;
qp = container_of(q, struct ipq, q); qp = container_of(q, struct ipq, q);
return qp->id == arg->iph->id && return qp->id == arg->iph->id &&
qp->saddr == arg->iph->saddr && qp->saddr == arg->iph->saddr &&
qp->daddr == arg->iph->daddr && qp->daddr == arg->iph->daddr &&
qp->protocol == arg->iph->protocol && qp->protocol == arg->iph->protocol &&
qp->user == arg->user; qp->user == arg->user;
} }
/* Memory Tracking Functions. */ /* Memory Tracking Functions. */
......
...@@ -134,15 +134,16 @@ static unsigned int ip6_hashfn(struct inet_frag_queue *q) ...@@ -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); 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 frag_queue *fq;
struct ip6_create_arg *arg = a; struct ip6_create_arg *arg = a;
fq = container_of(q, struct frag_queue, q); fq = container_of(q, struct frag_queue, q);
return (fq->id == arg->id && fq->user == arg->user && return fq->id == arg->id &&
ipv6_addr_equal(&fq->saddr, arg->src) && fq->user == arg->user &&
ipv6_addr_equal(&fq->daddr, arg->dst)); ipv6_addr_equal(&fq->saddr, arg->src) &&
ipv6_addr_equal(&fq->daddr, arg->dst);
} }
EXPORT_SYMBOL(ip6_frag_match); EXPORT_SYMBOL(ip6_frag_match);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment