Skip to content

Commit

Permalink
atm: clip: move clip_devs check to clip_push
Browse files Browse the repository at this point in the history
This will allow further cleanup.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jorge Boncompte [DTI2] authored and David S. Miller committed Nov 22, 2011
1 parent ada22aa commit 3b82936
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions net/atm/clip.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,13 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)
struct clip_vcc *clip_vcc = CLIP_VCC(vcc);

pr_debug("\n");

if (!clip_devs) {
atm_return(vcc, skb->truesize);
kfree_skb(skb);
return;
}

if (!skb) {
pr_debug("removing VCC %p\n", clip_vcc);
if (clip_vcc->entry)
Expand Down Expand Up @@ -480,13 +487,9 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
spin_unlock_irqrestore(&rq->lock, flags);

/* re-process everything received between connection setup and MKIP */
skb_queue_walk_safe(&queue, skb, tmp) {
if (!clip_devs) {
atm_return(vcc, skb->truesize);
kfree_skb(skb);
} else
clip_push(vcc, skb);
}
skb_queue_walk_safe(&queue, skb, tmp)
clip_push(vcc, skb);

return 0;
}

Expand Down

0 comments on commit 3b82936

Please sign in to comment.