Skip to contentSkip to conversation

drivers: ddm72xx: remove last usage of NIPQUAD and NIP6

PATCH Superseded Shan Wei 2 participants 2 messages Nov 22, 2012 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/1 drivers: ddm72xx: remove last usage of NIPQUAD and NIP6

From: Shan Wei <[email protected]>

commit cf4ca4874fc45 removed the definition of NIPQUAD and NIPQUAD_FMT, and NIP6 also is out of date.

Because DEBUG_SDU is not defined in gdm_wimax.h, no error message when compiling this code.

commit cf4ca4874fc45166198424384275f443a672d0b7

Author: Joe Perches <[email protected]>
Date:   Mon Aug 9 17:20:20 2010 -0700

kernel.h: remove unused NIPQUAD and NIPQUAD_FMT
There are no more uses of NIPQUAD or NIPQUAD_FMT. Remove the definitions.

Signed-off-by Shan Wei <[email protected]>
---
 drivers/staging/gdm72xx/gdm_wimax.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
drivers/staging/gdm72xx/gdm_wimax.c +1 -9
index 6cb8107..c0ec4d0 100644
@@ -166,21 +166,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",
-				NIPQUAD(ih->saddr));
+			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);
Signature · 1 line
1.7.1