--- drivers/atm/solos-pci.c

+++ drivers/atm/solos-pci.c

@@ -688,7 +688,7 @@ void solos_bh(unsigned long card_arg)

size);

}

if (atmdebug) {

- dev_info(&card->dev->dev, "Received: port %d\n", port);

+ dev_info(&card->dev->dev, "Received: device %d\n", port);

dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",

size, le16_to_cpu(header->vpi),

le16_to_cpu(header->vci));

@@ -774,8 +774,7 @@ static struct atm_vcc *find_vcc(struct a

sk_for_each(s, node, head) {

vcc = atm_sk(s);

if (vcc->dev == dev && vcc->vci == vci &&

- vcc->vpi == vpi && vcc->qos.rxtp.traffic_class != ATM_NONE &&

- test_bit(ATM_VF_READY, &vcc->flags))

+ vcc->vpi == vpi && vcc->qos.rxtp.traffic_class != ATM_NONE)

goto out;

}

vcc = NULL;

@@ -901,10 +900,6 @@ static void pclose(struct atm_vcc *vcc)

clear_bit(ATM_VF_ADDR, &vcc->flags);

clear_bit(ATM_VF_READY, &vcc->flags);

- /* Hold up vcc_destroy_socket() (our caller) until solos_bh() in the

- tasklet has finished processing any incoming packets (and, more to

- the point, using the vcc pointer). */

- tasklet_unlock_wait(&card->tlet);

return;

}

@@ -1008,15 +1003,8 @@ static uint32_t fpga_tx(struct solos_car

/* Clean up and free oldskb now it's gone */

if (atmdebug) {

- struct pkt_hdr *header = (void *)oldskb->data;

- int size = le16_to_cpu(header->size);

-

- skb_pull(oldskb, sizeof(*header));

dev_info(&card->dev->dev, "Transmitted: port %d\n",

port);

- dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",

- size, le16_to_cpu(header->vpi),

- le16_to_cpu(header->vci));

print_buffer(oldskb);

}