diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-29 23:15:30 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-12-02 00:06:03 +0000 |
| commit | 213e85d389124f49c82d52cfb4473b8bb672f7c1 (patch) | |
| tree | 3e433e2a17951b0ffc57a4a638ff0366ee437c07 | |
| parent | 5b4d72080f49498d2390563aa90f5bc31785406c (diff) | |
| download | linux-stable-213e85d389124f49c82d52cfb4473b8bb672f7c1.tar.gz linux-stable-213e85d389124f49c82d52cfb4473b8bb672f7c1.tar.bz2 linux-stable-213e85d389124f49c82d52cfb4473b8bb672f7c1.zip | |
solos-pci: clean up pclose() function
- Flush pending TX skbs from the queue rather than waiting for them all to
complete (suggested by Krzysztof Mazur <krzysiek@podlesie.net>).
- Clear ATM_VF_ADDR only when the PKT_PCLOSE packet has been submitted.
- Don't clear ATM_VF_READY at all — vcc_destroy_socket() does that for us.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/atm/solos-pci.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index f0863b443762..3f7c4ef1e111 100644 --- a/drivers/atm/solos-pci.c +++ b/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; } |