| 1 | commit 18b429e74eeafe42e947b1b0f9a760c7153a0b5c |
| 2 | Author: Philip A. Prindeville <philipp@redfish-solutions.com> |
| 3 | Date: Wed Mar 30 12:59:26 2011 +0000 |
| 4 | |
| 5 | atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump |
| 6 | |
| 7 | Omit pkt_hdr preamble when dumping transmitted packet as hex-dump; |
| 8 | we can pull this up because the frame has already been sent, and |
| 9 | dumping it is the last thing we do with it before freeing it. |
| 10 | |
| 11 | Also include the size, vpi, and vci in the debug as is done on |
| 12 | receive. |
| 13 | |
| 14 | Use "port" consistently instead of "device" intermittently. |
| 15 | |
| 16 | Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> |
| 17 | Signed-off-by: David S. Miller <davem@davemloft.net> |
| 18 | --- |
| 19 | drivers/atm/solos-pci.c | 9 ++++++++- |
| 20 | 1 files changed, 8 insertions(+), 1 deletions(-) |
| 21 | |
| 22 | --- a/drivers/atm/solos-pci.c |
| 23 | +++ b/drivers/atm/solos-pci.c |
| 24 | @@ -697,7 +697,7 @@ void solos_bh(unsigned long card_arg) |
| 25 | size); |
| 26 | } |
| 27 | if (atmdebug) { |
| 28 | - dev_info(&card->dev->dev, "Received: device %d\n", port); |
| 29 | + dev_info(&card->dev->dev, "Received: port %d\n", port); |
| 30 | dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n", |
| 31 | size, le16_to_cpu(header->vpi), |
| 32 | le16_to_cpu(header->vci)); |
| 33 | @@ -1018,8 +1018,15 @@ static uint32_t fpga_tx(struct solos_car |
| 34 | |
| 35 | /* Clean up and free oldskb now it's gone */ |
| 36 | if (atmdebug) { |
| 37 | + struct pkt_hdr *header = (void *)oldskb->data; |
| 38 | + int size = le16_to_cpu(header->size); |
| 39 | + |
| 40 | + skb_pull(oldskb, sizeof(*header)); |
| 41 | dev_info(&card->dev->dev, "Transmitted: port %d\n", |
| 42 | port); |
| 43 | + dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n", |
| 44 | + size, le16_to_cpu(header->vpi), |
| 45 | + le16_to_cpu(header->vci)); |
| 46 | print_buffer(oldskb); |
| 47 | } |
| 48 | |
| 49 | |
