aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_fragment.c
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2014-08-01 06:29:44 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-02 18:31:31 -0400
commit06aa8b8a0345c78f4d9a1fb3f852952b12a0e40c (patch)
tree9511c6007eed4f71fe5e601688f35d6ff7dd4b9b /net/ipv4/inet_fragment.c
parentd2373862b3589260f0139a6e4969478f84154369 (diff)
inet: frags: rename last_in to flags
The last_in field has been used to store various flags different from first/last frag in so give it a more descriptive name: flags. Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.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.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 62b1f73749dc..e3ebc6608e5d 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -152,8 +152,8 @@ evict_again:
152 } 152 }
153 153
154 /* suppress xmit of (icmp) error packet */ 154 /* suppress xmit of (icmp) error packet */
155 fq->last_in &= ~INET_FRAG_FIRST_IN; 155 fq->flags &= ~INET_FRAG_FIRST_IN;
156 fq->last_in |= INET_FRAG_EVICTED; 156 fq->flags |= INET_FRAG_EVICTED;
157 hlist_del(&fq->list); 157 hlist_del(&fq->list);
158 hlist_add_head(&fq->list, &expired); 158 hlist_add_head(&fq->list, &expired);
159 ++evicted; 159 ++evicted;
@@ -289,16 +289,16 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
289 if (del_timer(&fq->timer)) 289 if (del_timer(&fq->timer))
290 atomic_dec(&fq->refcnt); 290 atomic_dec(&fq->refcnt);
291 291
292 if (!(fq->last_in & INET_FRAG_COMPLETE)) { 292 if (!(fq->flags & INET_FRAG_COMPLETE)) {
293 fq_unlink(fq, f); 293 fq_unlink(fq, f);
294 atomic_dec(&fq->refcnt); 294 atomic_dec(&fq->refcnt);
295 fq->last_in |= INET_FRAG_COMPLETE; 295 fq->flags |= INET_FRAG_COMPLETE;
296 } 296 }
297} 297}
298EXPORT_SYMBOL(inet_frag_kill); 298EXPORT_SYMBOL(inet_frag_kill);
299 299
300static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f, 300static inline void frag_kfree_skb(struct netns_frags *nf, struct inet_frags *f,
301 struct sk_buff *skb) 301 struct sk_buff *skb)
302{ 302{
303 if (f->skb_free) 303 if (f->skb_free)
304 f->skb_free(skb); 304 f->skb_free(skb);
@@ -311,7 +311,7 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)
311 struct netns_frags *nf; 311 struct netns_frags *nf;
312 unsigned int sum, sum_truesize = 0; 312 unsigned int sum, sum_truesize = 0;
313 313
314 WARN_ON(!(q->last_in & INET_FRAG_COMPLETE)); 314 WARN_ON(!(q->flags & INET_FRAG_COMPLETE));
315 WARN_ON(del_timer(&q->timer) != 0); 315 WARN_ON(del_timer(&q->timer) != 0);
316 316
317 /* Release all fragment data. */ 317 /* Release all fragment data. */
@@ -349,7 +349,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf,
349 if (qp->net == nf && f->match(qp, arg)) { 349 if (qp->net == nf && f->match(qp, arg)) {
350 atomic_inc(&qp->refcnt); 350 atomic_inc(&qp->refcnt);
351 spin_unlock(&hb->chain_lock); 351 spin_unlock(&hb->chain_lock);
352 qp_in->last_in |= INET_FRAG_COMPLETE; 352 qp_in->flags |= INET_FRAG_COMPLETE;
353 inet_frag_put(qp_in, f); 353 inet_frag_put(qp_in, f);
354 return qp; 354 return qp;
355 } 355 }