diff options
author | Joe Perches <joe@perches.com> | 2008-03-28 19:35:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-28 19:35:27 -0400 |
commit | bc578a54f0fd489d0722303f9a52508495ccaf9a (patch) | |
tree | 6d0820f88aec63d764bef404b326ef65042d29aa /net/ipv4/inet_fragment.c | |
parent | be2ce06b4962658d807410e58f7c6b739dc6a0c3 (diff) |
[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*
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>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
-rw-r--r-- | net/ipv4/inet_fragment.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 724d69aed031..93170bfcc22e 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -104,10 +104,10 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f) | |||
104 | if (del_timer(&fq->timer)) | 104 | if (del_timer(&fq->timer)) |
105 | atomic_dec(&fq->refcnt); | 105 | atomic_dec(&fq->refcnt); |
106 | 106 | ||
107 | if (!(fq->last_in & COMPLETE)) { | 107 | if (!(fq->last_in & INET_FRAG_COMPLETE)) { |
108 | fq_unlink(fq, f); | 108 | fq_unlink(fq, f); |
109 | atomic_dec(&fq->refcnt); | 109 | atomic_dec(&fq->refcnt); |
110 | fq->last_in |= COMPLETE; | 110 | fq->last_in |= INET_FRAG_COMPLETE; |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
@@ -131,7 +131,7 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f, | |||
131 | struct sk_buff *fp; | 131 | struct sk_buff *fp; |
132 | struct netns_frags *nf; | 132 | struct netns_frags *nf; |
133 | 133 | ||
134 | BUG_TRAP(q->last_in & COMPLETE); | 134 | BUG_TRAP(q->last_in & INET_FRAG_COMPLETE); |
135 | BUG_TRAP(del_timer(&q->timer) == 0); | 135 | BUG_TRAP(del_timer(&q->timer) == 0); |
136 | 136 | ||
137 | /* Release all fragment data. */ | 137 | /* Release all fragment data. */ |
@@ -174,7 +174,7 @@ int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f) | |||
174 | read_unlock(&f->lock); | 174 | read_unlock(&f->lock); |
175 | 175 | ||
176 | spin_lock(&q->lock); | 176 | spin_lock(&q->lock); |
177 | if (!(q->last_in & COMPLETE)) | 177 | if (!(q->last_in & INET_FRAG_COMPLETE)) |
178 | inet_frag_kill(q, f); | 178 | inet_frag_kill(q, f); |
179 | spin_unlock(&q->lock); | 179 | spin_unlock(&q->lock); |
180 | 180 | ||
@@ -206,7 +206,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, | |||
206 | if (qp->net == nf && f->match(qp, arg)) { | 206 | if (qp->net == nf && f->match(qp, arg)) { |
207 | atomic_inc(&qp->refcnt); | 207 | atomic_inc(&qp->refcnt); |
208 | write_unlock(&f->lock); | 208 | write_unlock(&f->lock); |
209 | qp_in->last_in |= COMPLETE; | 209 | qp_in->last_in |= INET_FRAG_COMPLETE; |
210 | inet_frag_put(qp_in, f); | 210 | inet_frag_put(qp_in, f); |
211 | return qp; | 211 | return qp; |
212 | } | 212 | } |