diff options
author | Eric Dumazet <edumazet@google.com> | 2012-05-17 23:57:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-18 01:40:27 -0400 |
commit | cbc264cacd08e51fd4a64b5d5b1ba48f523990d1 (patch) | |
tree | f51584e8a78fad165debfe1e0d01715d9f493f3b /net | |
parent | 28e85100ae0fd814db723aeaaa785270bf4d600d (diff) |
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: Eric Dumazet <edumazet@google.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ip_fragment.c | 10 | ||||
-rw-r--r-- | net/ipv6/reassembly.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 9f9bd139335f..695b27f44161 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -148,17 +148,17 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q) | |||
148 | return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol); | 148 | return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol); |
149 | } | 149 | } |
150 | 150 | ||
151 | static int ip4_frag_match(struct inet_frag_queue *q, void *a) | 151 | static bool ip4_frag_match(struct inet_frag_queue *q, void *a) |
152 | { | 152 | { |
153 | struct ipq *qp; | 153 | struct ipq *qp; |
154 | struct ip4_create_arg *arg = a; | 154 | struct ip4_create_arg *arg = a; |
155 | 155 | ||
156 | qp = container_of(q, struct ipq, q); | 156 | qp = container_of(q, struct ipq, q); |
157 | return qp->id == arg->iph->id && | 157 | return qp->id == arg->iph->id && |
158 | qp->saddr == arg->iph->saddr && | 158 | qp->saddr == arg->iph->saddr && |
159 | qp->daddr == arg->iph->daddr && | 159 | qp->daddr == arg->iph->daddr && |
160 | qp->protocol == arg->iph->protocol && | 160 | qp->protocol == arg->iph->protocol && |
161 | qp->user == arg->user; | 161 | qp->user == arg->user; |
162 | } | 162 | } |
163 | 163 | ||
164 | /* Memory Tracking Functions. */ | 164 | /* Memory Tracking Functions. */ |
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index f1b86fdc06ad..5d32dfa4d75a 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -134,15 +134,16 @@ static unsigned int ip6_hashfn(struct inet_frag_queue *q) | |||
134 | return inet6_hash_frag(fq->id, &fq->saddr, &fq->daddr, ip6_frags.rnd); | 134 | return inet6_hash_frag(fq->id, &fq->saddr, &fq->daddr, ip6_frags.rnd); |
135 | } | 135 | } |
136 | 136 | ||
137 | int ip6_frag_match(struct inet_frag_queue *q, void *a) | 137 | bool ip6_frag_match(struct inet_frag_queue *q, void *a) |
138 | { | 138 | { |
139 | struct frag_queue *fq; | 139 | struct frag_queue *fq; |
140 | struct ip6_create_arg *arg = a; | 140 | struct ip6_create_arg *arg = a; |
141 | 141 | ||
142 | fq = container_of(q, struct frag_queue, q); | 142 | fq = container_of(q, struct frag_queue, q); |
143 | return (fq->id == arg->id && fq->user == arg->user && | 143 | return fq->id == arg->id && |
144 | ipv6_addr_equal(&fq->saddr, arg->src) && | 144 | fq->user == arg->user && |
145 | ipv6_addr_equal(&fq->daddr, arg->dst)); | 145 | ipv6_addr_equal(&fq->saddr, arg->src) && |
146 | ipv6_addr_equal(&fq->daddr, arg->dst); | ||
146 | } | 147 | } |
147 | EXPORT_SYMBOL(ip6_frag_match); | 148 | EXPORT_SYMBOL(ip6_frag_match); |
148 | 149 | ||