Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933034Ab2K0Ch6 (ORCPT ); Mon, 26 Nov 2012 21:37:58 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:53795 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755614Ab2K0Ch5 (ORCPT ); Mon, 26 Nov 2012 21:37:57 -0500 Message-ID: <50B4277A.6080307@gmail.com> Date: Tue, 27 Nov 2012 10:37:46 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Greg KH , benchan@chromium.org, syahn@gctsemi.com, devel@driverdev.osuosl.org, pstew@chromium.org, devel@driverdev.osuosl.org, joe@perches.com CC: Kernel-Maillist Subject: [PATCH v3] drivers: staging: remove last usage of NIPQUAD and NIP6 in gdm72xx Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1697 Lines: 53 From: Shan Wei 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 --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/