Attachment 123231 Details for Bug 177853 – Fix

[patch] Fix

fix-nip6_fmt.patch (text/plain), 5.82 KB, created by David Woodhouse on 2006-01-16 11:44:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2006-01-16 11:44:29 UTC

Size: 5.82 KB

patch

obsolete

>From netdev-owner@vger.kernel.org Sat Jan 14 00:11:34 2006
>Return-path: <netdev-owner@vger.kernel.org>
>Envelope-to: dwmw2@baythorne.infradead.org
>Delivery-date: Sat, 14 Jan 2006 00:11:34 +0000
>Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
>	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
>	1ExZ13-00087o-Ub for dwmw2@baythorne.infradead.org; Sat, 14 Jan 2006
>	00:11:34 +0000
>Received: from vger.kernel.org ([209.132.176.167]) by
>	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
>	1ExZ12-0007zM-VL; Sat, 14 Jan 2006 00:11:33 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id
>	S1161574AbWANALb (ORCPT <rfc822;dwmw2@infradead.org> + 1 other); Fri, 13
>	Jan 2006 19:11:31 -0500
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id
>	S1161579AbWANALb (ORCPT <rfc822;netdev-outgoing>); Fri, 13 Jan 2006
>	19:11:31 -0500
>Received: from yue.linux-ipv6.org ([203.178.140.15]:21776 "EHLO
>	yue.st-paulia.net") by vger.kernel.org with ESMTP id S1161574AbWANALa
>	(ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 13 Jan 2006 19:11:30 -0500
>Received: from localhost (localhost [127.0.0.1]) by yue.st-paulia.net
>	(Postfix) with ESMTP id 4C7F933CC2; Sat, 14 Jan 2006 09:12:21 +0900 (JST)
>Date:	Sat, 14 Jan 2006 09:12:13 +0900 (JST)
>Message-Id: <20060114.091213.64259870.yoshfuji@linux-ipv6.org>
>To:	davem@davemloft.net
>Cc:	joe@perches.com, netdev@vger.kernel.org, yoshfuji@linux-ipv6.org
>Subject: Re: [PATCH] Use NIP6_FMT in kernel.h
>From:	YOSHIFUJI Hideaki / =?iso-2022-jp?B?GyRCNUhGIzFRTEAbKEI=?=  <yoshfuji@linux-ipv6.org>
>In-Reply-To: <20060113.142924.50915981.davem@davemloft.net>
>References: <1137190488.13017.34.camel@localhost>
>	 <20060113.142924.50915981.davem@davemloft.net>
>Organization: USAGI/WIDE Project
>X-URL:	http://www.yoshifuji.org/%7Ehideaki/
>X-Fingerprint: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA
>X-PGP-Key-URL: http://www.yoshifuji.org/%7Ehideaki/hideaki@yoshifuji.org.asc
>X-Face:
>		"5$Al-.M>NJ%a'@hhZdQm:."qn~PA^gq4o*>iCFToq*bAi#4FRtx}enhuQKz7fNqQz\BYU]
>	$~O_5m-9'}MIs`XGwIEscw;e5b>n"B_?j/AkL~i/MEa<!5P`&C$@oP>ZBLP
>X-Mailer: Mew version 2.2 on Emacs 20.7 / Mule 4.1 (AOI)
>Mime-Version: 1.0
>Content-Type: Text/Plain; charset=us-ascii
>Sender:	netdev-owner@vger.kernel.org
>Precedence: bulk
>X-Mailing-List:	netdev@vger.kernel.org
>X-Evolution-Source: imap://dwmw2@pentafluge.infradead.org/
>Content-Transfer-Encoding: 8bit
>
>In article <20060113.142924.50915981.davem@davemloft.net> (at Fri, 13 Jan 2006 14:29:24 -0800 (PST)), "David S. Miller" <davem@davemloft.net> says:
>
>> > 	changes all code to use NIP6_FMT
>> > 	fixes net/ipv6/ip6_flowlabel.c
>:
>> This looks good, applied, thanks Joe.
>
>As I have commented in another mail, the original patch breaks
>applications such as ifconfig, radvd etc.
>
>Please apply this.
>
>Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>
>diff -u b/include/linux/kernel.h b/include/linux/kernel.h
>--- b/include/linux/kernel.h
>+++ b/include/linux/kernel.h
>@@ -228,6 +228,7 @@
> 	ntohs((addr).s6_addr16[6]), \
> 	ntohs((addr).s6_addr16[7])
> #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
>+#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x"
> 
> #if defined(__LITTLE_ENDIAN)
> #define HIPQUAD(addr) \
>diff -u b/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
>--- b/net/ipv6/addrconf.c
>+++ b/net/ipv6/addrconf.c
>@@ -2643,7 +2643,7 @@
> {
> 	struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
> 	seq_printf(seq,
>-		   NIP6_FMT " %02x %02x %02x %02x %8s\n",
>+		   NIP6_SEQFMT " %02x %02x %02x %02x %8s\n",
> 		   NIP6(ifp->addr),
> 		   ifp->idev->dev->ifindex,
> 		   ifp->prefix_len,
>diff -u b/net/ipv6/anycast.c b/net/ipv6/anycast.c
>--- b/net/ipv6/anycast.c
>+++ b/net/ipv6/anycast.c
>@@ -531,7 +531,7 @@
> 	struct ac6_iter_state *state = ac6_seq_private(seq);
> 
> 	seq_printf(seq,
>-		   "%-4d %-15s " NIP6_FMT " %5d\n",
>+		   "%-4d %-15s " NIP6_SEQFMT " %5d\n",
> 		   state->dev->ifindex, state->dev->name,
> 		   NIP6(im->aca_addr),
> 		   im->aca_users);
>diff -u b/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
>--- b/net/ipv6/ip6_flowlabel.c
>+++ b/net/ipv6/ip6_flowlabel.c
>@@ -628,7 +628,7 @@
> {
> 	while(fl) {
> 		seq_printf(seq,
>-			   "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_FMT " %-4d\n",
>+			   "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_SEQFMT " %-4d\n",
> 			   (unsigned)ntohl(fl->label),
> 			   fl->share,
> 			   (unsigned)fl->owner,
>@@ -644,7 +644,7 @@
> static int ip6fl_seq_show(struct seq_file *seq, void *v)
> {
> 	if (v == SEQ_START_TOKEN)
>-		seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-39s %s\n",
>+		seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-32s %s\n",
> 			   "Label", "S", "Owner", "Users", "Linger", "Expires", "Dst", "Opt");
> 	else
> 		ip6fl_fl_seq_show(seq, v);
>diff -u b/net/ipv6/mcast.c b/net/ipv6/mcast.c
>--- b/net/ipv6/mcast.c
>+++ b/net/ipv6/mcast.c
>@@ -2374,7 +2374,7 @@
> 	struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
> 
> 	seq_printf(seq,
>-		   "%-4d %-15s " NIP6_FMT " %5d %08X %ld\n", 
>+		   "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n", 
> 		   state->dev->ifindex, state->dev->name,
> 		   NIP6(im->mca_addr),
> 		   im->mca_users, im->mca_flags,
>@@ -2543,12 +2543,12 @@
> 	if (v == SEQ_START_TOKEN) {
> 		seq_printf(seq, 
> 			   "%3s %6s "
>-			   "%39s %39s %6s %6s\n", "Idx",
>+			   "%32s %32s %6s %6s\n", "Idx",
> 			   "Device", "Multicast Address",
> 			   "Source Address", "INC", "EXC");
> 	} else {
> 		seq_printf(seq,
>-			   "%3d %6.6s " NIP6_FMT " " NIP6_FMT " %6lu %6lu\n",
>+			   "%3d %6.6s " NIP6_SEQFMT " " NIP6_SEQFMT " %6lu %6lu\n",
> 			   state->dev->ifindex, state->dev->name,
> 			   NIP6(state->im->mca_addr),
> 			   NIP6(psf->sf_addr),
>
>-- 
>YOSHIFUJI Hideaki @ USAGI Project  <yoshfuji@linux-ipv6.org>
>GPG-FP  : 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA
>-
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 177853: 123231