Commit 213e85d3 authored by David Woodhouse's avatar David Woodhouse

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 <>).
 - 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: default avatarDavid Woodhouse <>
parent 5b4d7208
......@@ -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 */
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);
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)
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))
"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). */
clear_bit(ATM_VF_ADDR, &vcc->flags);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment