mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-23 14:27:16 +03:00
ac6a544e6c
These patches were submitted to netdev and will likely be out in 2.6.38.3. In the meantime, they're needed in 2.6.37.6. Patch by Philip Prindeville git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26616 3c298f89-4303-0410-b956-a3cf2f4a3e73
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
commit 18b429e74eeafe42e947b1b0f9a760c7153a0b5c
|
|
Author: Philip A. Prindeville <philipp@redfish-solutions.com>
|
|
Date: Wed Mar 30 12:59:26 2011 +0000
|
|
|
|
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>
|
|
---
|
|
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);
|
|
}
|
|
|
|
|