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>
This commit is contained in:
Philip A. Prindeville 2011-03-30 12:59:26 +00:00 committed by David S. Miller
parent 1e19e65856
commit 18b429e74e

View File

@ -697,7 +697,7 @@ void solos_bh(unsigned long card_arg)
size); size);
} }
if (atmdebug) { 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", dev_info(&card->dev->dev, "size: %d VPI: %d VCI: %d\n",
size, le16_to_cpu(header->vpi), size, le16_to_cpu(header->vpi),
le16_to_cpu(header->vci)); 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 */ /* Clean up and free oldskb now it's gone */
if (atmdebug) { 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", dev_info(&card->dev->dev, "Transmitted: port %d\n",
port); 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); print_buffer(oldskb);
} }