提交 18b429e7 编写于 作者: P Philip A. Prindeville 提交者: David S. Miller

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: NPhilip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 1e19e658
...@@ -697,7 +697,7 @@ void solos_bh(unsigned long card_arg) ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册