[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <50B4277A.6080307@gmail.com>
Date: Tue, 27 Nov 2012 10:37:46 +0800
From: Shan Wei <shanwei88@...il.com>
To: Greg KH <gregkh@...uxfoundation.org>, benchan@...omium.org,
syahn@...semi.com, devel@...verdev.osuosl.org, pstew@...omium.org,
devel@...verdev.osuosl.org, joe@...ches.com
CC: Kernel-Maillist <linux-kernel@...r.kernel.org>
Subject: [PATCH v3] drivers: staging: remove last usage of NIPQUAD and NIP6
in gdm72xx
From: Shan Wei <davidshan@...cent.com>
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. And remove constant condition judge.
Signed-off-by: Shan Wei <davidshan@...cent.com>
---
V3:
As suggestion of greg k-h's patch email bot, recreate this patch base on greg's staging tree,
v2 is on David Miller's net-next tree.
---
drivers/staging/gdm72xx/gdm_wimax.c | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
index 6cb8107..c0ec4d0 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -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);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists