From patchwork Sat Jul 31 15:05:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 60409 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 E892A1007D2 for ; Sun, 1 Aug 2010 01:06:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756579Ab0GaPGV (ORCPT ); Sat, 31 Jul 2010 11:06:21 -0400 Received: from khc.piap.pl ([195.187.100.11]:59352 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756508Ab0GaPGQ (ORCPT ); Sat, 31 Jul 2010 11:06:16 -0400 Received: from intrepid.localdomain (intrepid.localdomain [10.0.0.2]) by khc.piap.pl (Postfix) with ESMTP id CDA1298CA; Sat, 31 Jul 2010 17:05:53 +0200 (CEST) From: Krzysztof Halasa To: David Miller Cc: Subject: [PATCH 11/29] LMC: Get rid of lmcConsoleLog(). Date: Sat, 31 Jul 2010 17:05:34 +0200 Message-Id: <1280588752-9340-11-git-send-email-khc@pm.waw.pl> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Krzysztof Hałasa Signed-off-by: Krzysztof Hałasa --- drivers/net/wan/lmc/debug.c | 34 ---------------------------------- drivers/net/wan/lmc/debug.h | 13 ------------- drivers/net/wan/lmc/main.c | 17 ++++++++++++++--- 3 files changed, 14 insertions(+), 50 deletions(-) diff --git a/drivers/net/wan/lmc/debug.c b/drivers/net/wan/lmc/debug.c index 0abae05..e01b6e2 100644 --- a/drivers/net/wan/lmc/debug.c +++ b/drivers/net/wan/lmc/debug.c @@ -7,40 +7,6 @@ * Prints out len, max to 80 octets using printk, 20 per line */ -#if defined(DEBUG) && defined(LMC_PACKET_LOG) -void lmcConsoleLog(char *type, unsigned char *ucData, int iLen) -{ - int iNewLine = 1; - char str[80], *pstr; - - sprintf(str, KERN_DEBUG "lmc: %s: ", type); - pstr = str+strlen(str); - - if (iLen > 240) { - printk(KERN_DEBUG "lmc: Printing 240 chars... out of: %d\n", - iLen); - iLen = 240; - } else - printk(KERN_DEBUG "lmc: Printing %d chars\n", iLen); - - while (iLen > 0) { - sprintf(pstr, "%02x ", *ucData); - pstr += 3; - ucData++; - if (!(iNewLine % 20)) { - sprintf(pstr, "\n"); - printk(str); - sprintf(str, KERN_DEBUG "lmc: %s: ", type); - pstr = str + strlen(str); - } - iNewLine++; - iLen--; - } - sprintf(pstr, "\n"); - printk(str); -} -#endif - #ifdef DEBUG u32 lmcEventLogIndex; u32 lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS]; diff --git a/drivers/net/wan/lmc/debug.h b/drivers/net/wan/lmc/debug.h index 289f7d9..6bee4ee 100644 --- a/drivers/net/wan/lmc/debug.h +++ b/drivers/net/wan/lmc/debug.h @@ -1,18 +1,6 @@ #ifndef _LMC_DEBUG_H_ #define _LMC_DEBUG_H_ -#ifdef DEBUG -#ifdef LMC_PACKET_LOG -#define LMC_CONSOLE_LOG(x, y, z) lmcConsoleLog((x), (y), (z)) -#else -#define LMC_CONSOLE_LOG(x, y, z) -#endif -#else -#define LMC_CONSOLE_LOG(x, y, z) -#endif - - - /* Debug --- Event log definitions --- */ /* EVENTLOGSIZE*EVENTLOGARGS needs to be a power of 2 */ #define LMC_EVENTLOGSIZE 1024 /* number of events in eventlog */ @@ -45,7 +33,6 @@ extern u32 lmcEventLogBuf[LMC_EVENTLOGSIZE * LMC_EVENTLOGARGS]; #define LMC_EVENT_LOG(x, y, z) #endif /* end ifdef _DBG_EVENTLOG */ -void lmcConsoleLog(char *type, unsigned char *ucData, int iLen); void lmcEventLog(u32 EventNum, u32 arg2, u32 arg3); void lmc_trace(struct net_device *dev, char *msg); diff --git a/drivers/net/wan/lmc/main.c b/drivers/net/wan/lmc/main.c index 1fbd802..a19d63a 100644 --- a/drivers/net/wan/lmc/main.c +++ b/drivers/net/wan/lmc/main.c @@ -62,6 +62,8 @@ #include /* Processor type for cache alignment. */ #include +#undef DEBUG_PKT + #define DRIVER_MAJOR_VERSION 1 #define DRIVER_MINOR_VERSION 34 #define DRIVER_SUB_VERSION 0 @@ -1329,7 +1331,10 @@ static netdev_tx_t lmc_start_xmit(struct sk_buff *skb, sc->lmc_txq[entry] = skb; sc->lmc_txring[entry].buffer1 = virt_to_bus(skb->data); - LMC_CONSOLE_LOG("xmit", skb->data, skb->len); +#ifdef DEBUG_PKT + printk(KERN_DEBUG "%s TX(%i):", dev->name, skb->len); + debug_frame(skb); +#endif #ifndef GCOM /* If the queue is less than half full, don't interrupt */ @@ -1479,8 +1484,6 @@ static int lmc_rx(struct net_device *dev) sc->lmc_device->stats.rx_packets++; sc->lmc_device->stats.rx_bytes += len; - LMC_CONSOLE_LOG("recv", skb->data, len); - /* I'm not sure of the sanity of this. Packets could be arriving at a constant 44.210mbits/sec and we're going to copy them into a new buffer?? */ @@ -1493,6 +1496,10 @@ give_it_anyways: sc->lmc_rxring[i].buffer1 = 0x0; skb_put(skb, len); +#ifdef DEBUG_PKT + printk(KERN_DEBUG "%s RX(%i):", dev->name, len); + debug_frame(skb); +#endif skb->protocol = hdlc_type_trans(skb, sc->lmc_device); skb_reset_mac_header(skb); /* skb_reset_network_header(skb); */ @@ -1524,6 +1531,10 @@ give_it_anyways: if (!nsb) goto give_it_anyways; skb_copy_from_linear_data(skb, skb_put(nsb, len), len); +#ifdef DEBUG_PKT + printk(KERN_DEBUG "%s RX(%i):", dev->name, len); + debug_frame(nsb); +#endif nsb->protocol = hdlc_type_trans(nsb, sc->lmc_device); skb_reset_mac_header(nsb); /* skb_reset_network_header(nsb); */