From 1d723ed7ff66781f0bdad48d8fd00cfbc8b80ba9 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 29 Nov 2010 07:41:54 +0000
Subject: [PATCH] --- yaml --- r: 224709 b: refs/heads/master c:
 e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6 h: refs/heads/master i:   224707:
 96a37c0c3325871ba61acd846b170cd0d60c50a6 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/forcedeth.c | 54 +++++++++++------------------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/[refs] b/[refs]
index 88d726fc49d6..81ae2a77fe6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b80858d2c0a378894b9df35d3703d62b0b12dbc
+refs/heads/master: e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index 767d1eb87c94..1ac8b4e87276 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/drivers/net/forcedeth.c
@@ -2192,15 +2192,10 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	netdev_dbg(dev, "%s: entries %d queued for transmission. tx_flags_extra: %x\n",
 		   __func__, entries, tx_flags_extra);
-	{
-		int j;
-		for (j = 0; j < 64; j++) {
-			if ((j%16) == 0)
-				dprintk("\n%03x:", j);
-			dprintk(" %02x", ((unsigned char *)skb->data)[j]);
-		}
-		dprintk("\n");
-	}
+#ifdef DEBUG
+	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
+		       skb->data, 64, true);
+#endif
 
 	writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
 	return NETDEV_TX_OK;
@@ -2343,15 +2338,10 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
 
 	netdev_dbg(dev, "%s: entries %d queued for transmission. tx_flags_extra: %x\n",
 		   __func__, entries, tx_flags_extra);
-	{
-		int j;
-		for (j = 0; j < 64; j++) {
-			if ((j%16) == 0)
-				dprintk("\n%03x:", j);
-			dprintk(" %02x", ((unsigned char *)skb->data)[j]);
-		}
-		dprintk("\n");
-	}
+#ifdef DEBUG
+	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
+		       skb->data, 64, true);
+#endif
 
 	writel(NVREG_TXRXCTL_KICK|np->txrxctl_bits, get_hwbase(dev) + NvRegTxRxControl);
 	return NETDEV_TX_OK;
@@ -2666,16 +2656,11 @@ static int nv_rx_process(struct net_device *dev, int limit)
 		skb = np->get_rx_ctx->skb;
 		np->get_rx_ctx->skb = NULL;
 
-		{
-			int j;
 			netdev_dbg(dev, "Dumping packet (flags 0x%x)\n", flags);
-			for (j = 0; j < 64; j++) {
-				if ((j%16) == 0 && j)
-					dprintk("\n%03x:", j);
-				dprintk(" %02x", ((unsigned char *)skb->data)[j]);
-			}
-			dprintk("\n");
-		}
+#ifdef DEBUG
+			print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET,
+				       16, 1, skb->data, 64, true);
+#endif
 		/* look at what we actually got: */
 		if (np->desc_ver == DESC_VER_1) {
 			if (likely(flags & NV_RX_DESCRIPTORVALID)) {
@@ -2793,16 +2778,11 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
 		skb = np->get_rx_ctx->skb;
 		np->get_rx_ctx->skb = NULL;
 
-		{
-			int j;
-			netdev_dbg(dev, "Dumping packet (flags 0x%x)\n", flags);
-			for (j = 0; j < 64; j++) {
-				if ((j%16) == 0 && j)
-					dprintk("\n%03x:", j);
-				dprintk(" %02x", ((unsigned char *)skb->data)[j]);
-			}
-			dprintk("\n");
-		}
+		netdev_dbg(dev, "Dumping packet (flags 0x%x)\n", flags);
+#ifdef DEBUG
+		print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
+			       skb->data, 64, true);
+#endif
 		/* look at what we actually got: */
 		if (likely(flags & NV_RX2_DESCRIPTORVALID)) {
 			len = flags & LEN_MASK_V2;