From 7e70bd68017b7e9bb130ae8c7014449fa9da1fb6 Mon Sep 17 00:00:00 2001
From: Shan Wei <davidshan@tencent.com>
Date: Wed, 28 Nov 2012 10:54:31 +0800
Subject: [PATCH] --- yaml --- r: 338283 b: refs/heads/master c:
 0df1a84e0ec875d1bc12ac6aca325cb3543a7ad6 h: refs/heads/master i:   338281:
 3ff18852a9bd79c54f31dbe1845293a0dd6793d2   338279:
 be3f37cd0223fcbec8c7601a97f50c2693d4bbaa v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/gdm72xx/gdm_wimax.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2c701b0bc386..4e196e4e636a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f5d6d9d2def045cdf8d25f836b72ce46629814c
+refs/heads/master: 0df1a84e0ec875d1bc12ac6aca325cb3543a7ad6
diff --git a/trunk/drivers/staging/gdm72xx/gdm_wimax.c b/trunk/drivers/staging/gdm72xx/gdm_wimax.c
index c30276987d9a..41efbeeb62f1 100644
--- a/trunk/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/trunk/drivers/staging/gdm72xx/gdm_wimax.c
@@ -168,24 +168,13 @@ static void dump_eth_packet(const char *title, u8 *data, int len)
 		get_ip_protocol_name(ip_protocol),
 		get_port_name(port));
 
-	#if 1
 	if (!(data[0] == 0xff && data[1] == 0xff)) {
 		if (protocol == ETH_P_IP) {
-			printk(KERN_DEBUG "     src=%u.%u.%u.%u\n",
-				((unsigned char *)&(ih->saddr))[0],
-				((unsigned char *)&(ih->saddr))[1],
-				((unsigned char *)&(ih->saddr))[2],
-				((unsigned char *)&(ih->saddr))[3]);
+			printk(KERN_DEBUG "     src=%pI4\n", &ih->saddr);
 		} else if (protocol == ETH_P_IPV6) {
-			#ifdef NIP6
-			printk(KERN_DEBUG "     src=%x:%x:%x:%x:%x:%x:%x:%x\n",
-				NIP6(ih->saddr));
-			#else
 			printk(KERN_DEBUG "     src=%pI6\n", &ih->saddr);
-			#endif
 		}
 	}
-	#endif
 
 	#if (DUMP_PACKET & DUMP_SDU_ALL)
 	printk_hex(data, len);