diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-16 18:31:21 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-16 18:31:21 +0000 |
commit | 4d4c41d673f9c3ebdb73c7d98c22df64d4310157 (patch) | |
tree | 9f52b71698a01a09923ca445e48566dcb47b2f54 /target/linux/generic/patches-2.6.37/282-solos-debug_skbuff.patch | |
parent | b2cab73a788f178bfe2f8620d8c4a483dfba34fc (diff) |
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/282-solos-debug_skbuff.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.37/282-solos-debug_skbuff.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/patches-2.6.37/282-solos-debug_skbuff.patch b/target/linux/generic/patches-2.6.37/282-solos-debug_skbuff.patch deleted file mode 100644 index 837057e56..000000000 --- a/target/linux/generic/patches-2.6.37/282-solos-debug_skbuff.patch +++ /dev/null @@ -1,51 +0,0 @@ -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); - } - - |