From patchwork Wed Mar 30 22:59:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Prindeville X-Patchwork-Id: 88988 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3AA04B6EF2 for ; Thu, 31 Mar 2011 09:59:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756536Ab1C3W72 (ORCPT ); Wed, 30 Mar 2011 18:59:28 -0400 Received: from mail.redfish-solutions.com ([66.232.79.143]:49200 "EHLO mail.redfish-solutions.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756504Ab1C3W71 (ORCPT ); Wed, 30 Mar 2011 18:59:27 -0400 Received: from builder.redfish-solutions.com (builder.redfish-solutions.com [192.168.1.10]) by mail.redfish-solutions.com (8.14.4/8.14.4) with ESMTP id p2UMxQa0003525 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Mar 2011 16:59:26 -0600 Received: from builder.redfish-solutions.com (localhost.localdomain [127.0.0.1]) by builder.redfish-solutions.com (8.14.4/8.14.4) with ESMTP id p2UMxQbq028598; Wed, 30 Mar 2011 16:59:26 -0600 Received: (from philipp@localhost) by builder.redfish-solutions.com (8.14.4/8.14.4/Submit) id p2UMxQUf028596; Wed, 30 Mar 2011 16:59:26 -0600 X-Authentication-Warning: builder.redfish-solutions.com: philipp set sender to philipp_subx@redfish-solutions.com using -f From: Philip Prindeville To: netdev@vger.kernel.org Subject: [PATCH 2/2] atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump Date: Wed, 30 Mar 2011 16:59:26 -0600 Message-Id: <1301525966-28566-1-git-send-email-philipp_subx@redfish-solutions.com> X-Mailer: git-send-email 1.7.4 X-Scanned-By: MIMEDefang 2.72 on 192.168.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Philip A. Prindeville 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 --- 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); }