[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

On Fri, 2008-03-28 at 03:24 -0700, Andrew Morton wrote:
> they should all be renamed.

Done for include/net and net

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by

David S. Miller 18 years ago bc578a54 be2ce06b

+34 -31

5 changed files

expand all

include

net

inet_frag.h

net

ipv4

inet_fragment.c

ip_fragment.c

ipv6

netfilter

nf_conntrack_reasm.c

reassembly.c

+3 -3

include/net/inet_frag.h

··· 25 25 int meat; 26 26 __u8 last_in; /* first/last segment arrived? */ 27 27 28 - #define COMPLETE 4 29 - #define FIRST_IN 2 30 - #define LAST_IN 1 28 + #define INET_FRAG_COMPLETE 4 29 + #define INET_FRAG_FIRST_IN 2 30 + #define INET_FRAG_LAST_IN 1 31 31 }; 32 32 33 33 #define INETFRAGS_HASHSZ 64

+5 -5

net/ipv4/inet_fragment.c

··· 104 104 if (del_timer(&fq->timer)) 105 105 atomic_dec(&fq->refcnt); 106 106 107 - if (!(fq->last_in & COMPLETE)) { 107 + if (!(fq->last_in & INET_FRAG_COMPLETE)) { 108 108 fq_unlink(fq, f); 109 109 atomic_dec(&fq->refcnt); 110 - fq->last_in |= COMPLETE; 110 + fq->last_in |= INET_FRAG_COMPLETE; 111 111 } 112 112 } 113 113 ··· 131 131 struct sk_buff *fp; 132 132 struct netns_frags *nf; 133 133 134 - BUG_TRAP(q->last_in & COMPLETE); 134 + BUG_TRAP(q->last_in & INET_FRAG_COMPLETE); 135 135 BUG_TRAP(del_timer(&q->timer) == 0); 136 136 137 137 /* Release all fragment data. */ ··· 174 174 read_unlock(&f->lock); 175 175 176 176 spin_lock(&q->lock); 177 - if (!(q->last_in & COMPLETE)) 177 + if (!(q->last_in & INET_FRAG_COMPLETE)) 178 178 inet_frag_kill(q, f); 179 179 spin_unlock(&q->lock); 180 180 ··· 206 206 if (qp->net == nf && f->match(qp, arg)) { 207 207 atomic_inc(&qp->refcnt); 208 208 write_unlock(&f->lock); 209 - qp_in->last_in |= COMPLETE; 209 + qp_in->last_in |= INET_FRAG_COMPLETE; 210 210 inet_frag_put(qp_in, f); 211 211 return qp; 212 212 }

+9 -8

net/ipv4/ip_fragment.c

··· 194 194 195 195 spin_lock(&qp->q.lock); 196 196 197 - if (qp->q.last_in & COMPLETE) 197 + if (qp->q.last_in & INET_FRAG_COMPLETE) 198 198 goto out; 199 199 200 200 ipq_kill(qp); ··· 202 202 IP_INC_STATS_BH(IPSTATS_MIB_REASMTIMEOUT); 203 203 IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS); 204 204 205 - if ((qp->q.last_in&FIRST_IN) && qp->q.fragments != NULL) { 205 + if ((qp->q.last_in & INET_FRAG_FIRST_IN) && qp->q.fragments != NULL) { 206 206 struct sk_buff *head = qp->q.fragments; 207 207 struct net *net; 208 208 ··· 301 301 int ihl, end; 302 302 int err = -ENOENT; 303 303 304 - if (qp->q.last_in & COMPLETE) 304 + if (qp->q.last_in & INET_FRAG_COMPLETE) 305 305 goto err; 306 306 307 307 if (!(IPCB(skb)->flags & IPSKB_FRAG_COMPLETE) && ··· 327 327 * or have different end, the segment is corrrupted. 328 328 */ 329 329 if (end < qp->q.len || 330 - ((qp->q.last_in & LAST_IN) && end != qp->q.len)) 330 + ((qp->q.last_in & INET_FRAG_LAST_IN) && end != qp->q.len)) 331 331 goto err; 332 - qp->q.last_in |= LAST_IN; 332 + qp->q.last_in |= INET_FRAG_LAST_IN; 333 333 qp->q.len = end; 334 334 } else { 335 335 if (end&7) { ··· 339 339 } 340 340 if (end > qp->q.len) { 341 341 /* Some bits beyond end -> corruption. */ 342 - if (qp->q.last_in & LAST_IN) 342 + if (qp->q.last_in & INET_FRAG_LAST_IN) 343 343 goto err; 344 344 qp->q.len = end; 345 345 } ··· 438 438 qp->q.meat += skb->len; 439 439 atomic_add(skb->truesize, &qp->q.net->mem); 440 440 if (offset == 0) 441 - qp->q.last_in |= FIRST_IN; 441 + qp->q.last_in |= INET_FRAG_FIRST_IN; 442 442 443 - if (qp->q.last_in == (FIRST_IN | LAST_IN) && qp->q.meat == qp->q.len) 443 + if (qp->q.last_in == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) && 444 + qp->q.meat == qp->q.len) 444 445 return ip_frag_reasm(qp, prev, dev); 445 446 446 447 write_lock(&ip4_frags.lock);

+8 -7

net/ipv6/netfilter/nf_conntrack_reasm.c

··· 183 183 184 184 spin_lock(&fq->q.lock); 185 185 186 - if (fq->q.last_in & COMPLETE) 186 + if (fq->q.last_in & INET_FRAG_COMPLETE) 187 187 goto out; 188 188 189 189 fq_kill(fq); ··· 225 225 struct sk_buff *prev, *next; 226 226 int offset, end; 227 227 228 - if (fq->q.last_in & COMPLETE) { 228 + if (fq->q.last_in & INET_FRAG_COMPLETE) { 229 229 pr_debug("Allready completed\n"); 230 230 goto err; 231 231 } ··· 252 252 * or have different end, the segment is corrupted. 253 253 */ 254 254 if (end < fq->q.len || 255 - ((fq->q.last_in & LAST_IN) && end != fq->q.len)) { 255 + ((fq->q.last_in & INET_FRAG_LAST_IN) && end != fq->q.len)) { 256 256 pr_debug("already received last fragment\n"); 257 257 goto err; 258 258 } 259 - fq->q.last_in |= LAST_IN; 259 + fq->q.last_in |= INET_FRAG_LAST_IN; 260 260 fq->q.len = end; 261 261 } else { 262 262 /* Check if the fragment is rounded to 8 bytes. ··· 271 271 } 272 272 if (end > fq->q.len) { 273 273 /* Some bits beyond end -> corruption. */ 274 - if (fq->q.last_in & LAST_IN) { 274 + if (fq->q.last_in & INET_FRAG_LAST_IN) { 275 275 pr_debug("last packet already reached.\n"); 276 276 goto err; 277 277 } ··· 383 383 */ 384 384 if (offset == 0) { 385 385 fq->nhoffset = nhoff; 386 - fq->q.last_in |= FIRST_IN; 386 + fq->q.last_in |= INET_FRAG_FIRST_IN; 387 387 } 388 388 write_lock(&nf_frags.lock); 389 389 list_move_tail(&fq->q.lru_list, &nf_init_frags.lru_list); ··· 645 645 goto ret_orig; 646 646 } 647 647 648 - if (fq->q.last_in == (FIRST_IN|LAST_IN) && fq->q.meat == fq->q.len) { 648 + if (fq->q.last_in == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) && 649 + fq->q.meat == fq->q.len) { 649 650 ret_skb = nf_ct_frag6_reasm(fq, dev); 650 651 if (ret_skb == NULL) 651 652 pr_debug("Can't reassemble fragmented packets\n");

+9 -8

net/ipv6/reassembly.c

··· 202 202 203 203 spin_lock(&fq->q.lock); 204 204 205 - if (fq->q.last_in & COMPLETE) 205 + if (fq->q.last_in & INET_FRAG_COMPLETE) 206 206 goto out; 207 207 208 208 fq_kill(fq); ··· 217 217 rcu_read_unlock(); 218 218 219 219 /* Don't send error if the first segment did not arrive. */ 220 - if (!(fq->q.last_in&FIRST_IN) || !fq->q.fragments) 220 + if (!(fq->q.last_in & INET_FRAG_FIRST_IN) || !fq->q.fragments) 221 221 goto out; 222 222 223 223 /* ··· 265 265 struct net_device *dev; 266 266 int offset, end; 267 267 268 - if (fq->q.last_in & COMPLETE) 268 + if (fq->q.last_in & INET_FRAG_COMPLETE) 269 269 goto err; 270 270 271 271 offset = ntohs(fhdr->frag_off) & ~0x7; ··· 294 294 * or have different end, the segment is corrupted. 295 295 */ 296 296 if (end < fq->q.len || 297 - ((fq->q.last_in & LAST_IN) && end != fq->q.len)) 297 + ((fq->q.last_in & INET_FRAG_LAST_IN) && end != fq->q.len)) 298 298 goto err; 299 - fq->q.last_in |= LAST_IN; 299 + fq->q.last_in |= INET_FRAG_LAST_IN; 300 300 fq->q.len = end; 301 301 } else { 302 302 /* Check if the fragment is rounded to 8 bytes. ··· 314 314 } 315 315 if (end > fq->q.len) { 316 316 /* Some bits beyond end -> corruption. */ 317 - if (fq->q.last_in & LAST_IN) 317 + if (fq->q.last_in & INET_FRAG_LAST_IN) 318 318 goto err; 319 319 fq->q.len = end; 320 320 } ··· 417 417 */ 418 418 if (offset == 0) { 419 419 fq->nhoffset = nhoff; 420 - fq->q.last_in |= FIRST_IN; 420 + fq->q.last_in |= INET_FRAG_FIRST_IN; 421 421 } 422 422 423 - if (fq->q.last_in == (FIRST_IN | LAST_IN) && fq->q.meat == fq->q.len) 423 + if (fq->q.last_in == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) && 424 + fq->q.meat == fq->q.len) 424 425 return ip6_frag_reasm(fq, prev, dev); 425 426 426 427 write_lock(&ip6_frags.lock);