Skip to content

Commit

Permalink
staging: gdm72xx: use %pI4 format to print IPv4 address and remove la…
Browse files Browse the repository at this point in the history
…st usage of NIP6

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

commit 2874762 replace deprecated NIPQUAD marco to C code, but we can use %pI4 to
print IPv4 address more simply. And remove constant condition judge.

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

Signed-off-by: Shan Wei <davidshan@tencent.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Shan Wei authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 7f5d6d9 commit 0df1a84
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/staging/gdm72xx/gdm_wimax.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0df1a84

Please sign in to comment.