From dbfe4395ab65cfc3ceadb8e63bbc4fa763f2c8e6 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 29 Nov 2012 23:15:30 +0000 Subject: [PATCH] --- yaml --- r: 341711 b: refs/heads/master c: 213e85d389124f49c82d52cfb4473b8bb672f7c1 h: refs/heads/master i: 341709: e5024e423c13ac30cedc6871d8acc3516fde324d 341707: d1729339946a0b584030e64fae6e45c0c5934278 341703: 6755ff1326bf57fab5ba26921c004e452b27be04 341695: c9b3ac83b2b68555e708c278bef934b6eadd46f4 v: v3 --- [refs] | 2 +- trunk/drivers/atm/solos-pci.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d260bd88cf44..b66871368cc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b4d72080f49498d2390563aa90f5bc31785406c +refs/heads/master: 213e85d389124f49c82d52cfb4473b8bb672f7c1 diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/drivers/atm/solos-pci.c index f0863b443762..3f7c4ef1e111 100644 --- a/trunk/drivers/atm/solos-pci.c +++ b/trunk/drivers/atm/solos-pci.c @@ -868,9 +868,19 @@ static void pclose(struct atm_vcc *vcc) { struct solos_card *card = vcc->dev->dev_data; unsigned char port = SOLOS_CHAN(vcc->dev); - struct sk_buff *skb; + struct sk_buff *skb, *tmpskb; struct pkt_hdr *header; + /* Remove any yet-to-be-transmitted packets from the pending queue */ + spin_lock(&card->tx_queue_lock); + skb_queue_walk_safe(&card->tx_queue[port], skb, tmpskb) { + if (SKB_CB(skb)->vcc == vcc) { + skb_unlink(skb, &card->tx_queue[port]); + solos_pop(vcc, skb); + } + } + spin_unlock(&card->tx_queue_lock); + skb = alloc_skb(sizeof(*header), GFP_ATOMIC); if (!skb) { dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n"); @@ -886,9 +896,6 @@ static void pclose(struct atm_vcc *vcc) skb_get(skb); fpga_queue(card, port, skb, NULL); - clear_bit(ATM_VF_ADDR, &vcc->flags); - clear_bit(ATM_VF_READY, &vcc->flags); - if (!wait_event_timeout(card->param_wq, !skb_shared(skb), 5 * HZ)) dev_warn(&card->dev->dev, "Timeout waiting for VCC close on port %d\n", port); @@ -899,6 +906,9 @@ static void pclose(struct atm_vcc *vcc) tasklet has finished processing any incoming packets (and, more to the point, using the vcc pointer). */ tasklet_unlock_wait(&card->tlet); + + clear_bit(ATM_VF_ADDR, &vcc->flags); + return; }