lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atm: Use SKB queue and list helpers instead of doing it by-hand.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2009-05-28 16:36:47 -07:00
parent 46c37672d7
commit b6211ae7f2
2 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/atm/br2684.c
View File

@@ -445,9 +445,10 @@ free_skb:
*/ */
static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
{ {
struct sk_buff_head queue;
int err; int err;
struct br2684_vcc *brvcc; struct br2684_vcc *brvcc;
struct sk_buff *skb; struct sk_buff *skb, *tmp;
struct sk_buff_head *rq; struct sk_buff_head *rq;
struct br2684_dev *brdev; struct br2684_dev *brdev;
struct net_device *net_dev; struct net_device *net_dev;
@@ -505,29 +506,20 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
barrier(); barrier();
atmvcc->push = br2684_push; atmvcc->push = br2684_push;
__skb_queue_head_init(&queue);
rq = &sk_atm(atmvcc)->sk_receive_queue; rq = &sk_atm(atmvcc)->sk_receive_queue;
spin_lock_irqsave(&rq->lock, flags); spin_lock_irqsave(&rq->lock, flags);
if (skb_queue_empty(rq)) { skb_queue_splice_init(rq, &queue);
skb = NULL;
} else {
/* NULL terminate the list. */
rq->prev->next = NULL;
skb = rq->next;
}
rq->prev = rq->next = (struct sk_buff *)rq;
rq->qlen = 0;
spin_unlock_irqrestore(&rq->lock, flags); spin_unlock_irqrestore(&rq->lock, flags);
while (skb) { skb_queue_walk_safe(&queue, skb, tmp) {
struct sk_buff *next = skb->next; struct net_device *dev = skb->dev;
dev->stats.rx_bytes -= skb->len;
dev->stats.rx_packets--;
skb->next = skb->prev = NULL;
br2684_push(atmvcc, skb); br2684_push(atmvcc, skb);
skb->dev->stats.rx_bytes -= skb->len;
skb->dev->stats.rx_packets--;
skb = next;
} }
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
return 0; return 0;

27
net/atm/clip.c
View File

@@ -445,9 +445,9 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
static int clip_mkip(struct atm_vcc *vcc, int timeout) static int clip_mkip(struct atm_vcc *vcc, int timeout)
{ {
struct sk_buff_head *rq, queue;
struct clip_vcc *clip_vcc; struct clip_vcc *clip_vcc;
struct sk_buff *skb; struct sk_buff *skb, *tmp;
struct sk_buff_head *rq;
unsigned long flags; unsigned long flags;
if (!vcc->push) if (!vcc->push)
@@ -469,39 +469,28 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
vcc->push = clip_push; vcc->push = clip_push;
vcc->pop = clip_pop; vcc->pop = clip_pop;
__skb_queue_head_init(&queue);
rq = &sk_atm(vcc)->sk_receive_queue; rq = &sk_atm(vcc)->sk_receive_queue;
spin_lock_irqsave(&rq->lock, flags); spin_lock_irqsave(&rq->lock, flags);
if (skb_queue_empty(rq)) { skb_queue_splice_init(rq, &queue);
skb = NULL;
} else {
/* NULL terminate the list. */
rq->prev->next = NULL;
skb = rq->next;
}
rq->prev = rq->next = (struct sk_buff *)rq;
rq->qlen = 0;
spin_unlock_irqrestore(&rq->lock, flags); spin_unlock_irqrestore(&rq->lock, flags);
/* re-process everything received between connection setup and MKIP */ /* re-process everything received between connection setup and MKIP */
while (skb) { skb_queue_walk_safe(&queue, skb, tmp) {
struct sk_buff *next = skb->next;
skb->next = skb->prev = NULL;
if (!clip_devs) { if (!clip_devs) {
atm_return(vcc, skb->truesize); atm_return(vcc, skb->truesize);
kfree_skb(skb); kfree_skb(skb);
} else { } else {
struct net_device *dev = skb->dev;
unsigned int len = skb->len; unsigned int len = skb->len;
skb_get(skb); skb_get(skb);
clip_push(vcc, skb); clip_push(vcc, skb);
skb->dev->stats.rx_packets--; dev->stats.rx_packets--;
skb->dev->stats.rx_bytes -= len; dev->stats.rx_bytes -= len;
kfree_skb(skb); kfree_skb(skb);
} }
skb = next;
} }
return 0; return 0;
} }