[PATCH 2/2] solos-pci: Don't include pseudo-header in dump of frame
From: Philip Prindeville <hidden>
Date: 2011-03-28 07:04:07
Subsystem:
atm, the rest · Maintainers:
Chas Williams, Linus Torvalds
From: Philip Prindeville <redacted> Don't include pseudo-header as part of frame hex-dump on transmit. We can pull-up the "struct pkt_hdr" at the beginning of the sk_buff because it's already been used, and shouldn't be included in the output of print_buffer(), which is the last operation we'll do on the contents of this buffer before releasing it. Signed-off-by: Philip Prindeville <redacted> --- drivers/atm/solos-pci.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 2c4146a..968f022 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); }