diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:21 +0000 |
| commit | bb7cacb10f3e571e0955e1926c0e84ab3fec47e0 (patch) | |
| tree | 9f52b71698a01a09923ca445e48566dcb47b2f54 /target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch | |
| parent | c19a05ddc769a8b14837218fea04fe8b5c887eee (diff) | |
| download | upstream-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.tar.gz upstream-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.tar.bz2 upstream-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.zip | |
kernel: reorganize 2.6.37 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26692 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch b/target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch new file mode 100644 index 0000000000..cedfdf5d79 --- /dev/null +++ b/target/linux/generic/patches-2.6.37/052-solos-debug_skbuff.patch @@ -0,0 +1,48 @@ +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(-) + +--- 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_car + + /* 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); + } + |