summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorPhilip A. Prindeville <philipp@redfish-solutions.com>2011-03-30 12:59:26 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-30 16:53:37 -0700
commit18b429e74eeafe42e947b1b0f9a760c7153a0b5c (patch)
tree3661071773f197cf1b1224b5f7665d7ea75c411a /drivers/atm
parent1e19e658567472c46c9b4d27acdb804de04dfdac (diff)
downloadlinux-3.10-18b429e74eeafe42e947b1b0f9a760c7153a0b5c.tar.gz
linux-3.10-18b429e74eeafe42e947b1b0f9a760c7153a0b5c.tar.bz2
linux-3.10-18b429e74eeafe42e947b1b0f9a760c7153a0b5c.zip
atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump
Omit pkt_hdr preamble when dumping transmitted packet as hex-dump; we can pull this up because the frame has already been sent, and dumping it is the last thing we do with it before freeing it. Also include the size, vpi, and vci in the debug as is done on receive. Use "port" consistently instead of "device" intermittently. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/solos-pci.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 2c4146afd84..968f022d141 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -697,7 +697,7 @@ void solos_bh(unsigned long card_arg)
size);
}
if (atmdebug) {
- dev_info(&card->dev->dev, "Received: device %d\n", port);
+ dev_info(&card->dev->dev, "Received: 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));
@@ -1018,8 +1018,15 @@ static uint32_t fpga_tx(struct solos_card *card)
/* 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);
}