[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1321907158-27857-4-git-send-email-jorge@dti2.net>
Date: Mon, 21 Nov 2011 21:25:56 +0100
From: "Jorge Boncompte [DTI2]" <jorge@...2.net>
To: netdev@...r.kernel.org, linux-atm-general@...ts.sourceforge.net
Cc: "Jorge Boncompte [DTI2]" <jorge@...2.net>
Subject: [PATCH 3/5] atm: clip: move clip_devs check to clip_push
From: "Jorge Boncompte [DTI2]" <jorge@...2.net>
This will allow further cleanup.
Signed-off-by: Jorge Boncompte [DTI2] <jorge@...2.net>
---
net/atm/clip.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 3cb9470..521b45b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -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)
@@ -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;
}
--
1.7.7.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists