net: replace all current users of NIP6_SEQFMT with %#p6
Subsystems (8)
PATCH 2/6 net: replace all current users of NIP6_SEQFMT with %#p6
The define in kernel.h can be done away with at a later time.
Signed-off-by Harvey Harrison <[email protected]>
--- fs/cifs/cifs_spnego.c | 3 +-- net/ipv6/addrconf.c | 5 ++--- net/ipv6/anycast.c | 6 ++---- net/ipv6/ip6_flowlabel.c | 4 ++-- net/ipv6/mcast.c | 10 +++++----- net/ipv6/route.c | 9 +++------ net/sunrpc/xprtsock.c | 7 +++---- 7 files changed, 18 insertions(+), 26 deletions(-)
fs/cifs/cifs_spnego.c +1 -2
@@ -124,8 +124,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)sprintf (dp,"ip4=" NIPQUAD_FMT ,NIPQUAD (server->addr.sockAddr.sin_addr)); else if (server->addr.sockAddr.sin_family == AF_INET6) - sprintf(dp, "ip6=" NIP6_SEQFMT, - NIP6(server->addr.sockAddr6.sin6_addr)); + sprintf(dp, "ip6=%#p6", &server->addr.sockAddr6.sin6_addr); else goto out;
net/ipv6/addrconf.c +2 -3
@@ -2986,9 +2986,8 @@ static void if6_seq_stop(struct seq_file *seq, void *v)static int if6_seq_show (struct seq_file *seq,void *v) {struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; - seq_printf(seq, - NIP6_SEQFMT " %02x %02x %02x %02x %8s\n", - NIP6(ifp->addr), + seq_printf(seq, "%#p6 %02x %02x %02x %02x %8s\n", + &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, ifp->scope,
net/ipv6/anycast.c +2 -4
@@ -512,11 +512,9 @@ static int ac6_seq_show(struct seq_file *seq, void *v)struct ifacaddr6 *im = (struct ifacaddr6 *)v;struct ac6_iter_state *state =ac6_seq_private (seq); -seq_printf (seq, -"%-4d %-15s " NIP6_SEQFMT " %5d\n" , +seq_printf (seq,"%-4d %-15s %#p6 %5d\n" , state->dev->ifindex, state->dev->name, -NIP6 (im->aca_addr), - im->aca_users); + &im->aca_addr, im->aca_users);return 0 ; }
net/ipv6/ip6_flowlabel.c +2 -2
@@ -696,14 +696,14 @@ static int ip6fl_seq_show(struct seq_file *seq, void *v)else {struct ip6_flowlabel *fl = v;seq_printf (seq, -"%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_SEQFMT " %-4d\n" , +"%05X %-1d %-6d %-6d %-6ld %-8ld %#p6 %-4d\n" , (unsigned )ntohl (fl->label), fl->share, (unsigned )fl->owner,atomic_read (&fl->users), fl->linger/HZ , (long )(fl->expires - jiffies)/HZ , -NIP6 (fl->dst), + &fl->dst, fl->opt ? fl->opt->opt_nflen :0 ); }return 0 ;
net/ipv6/mcast.c +5 -5
@@ -2430,9 +2430,9 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)struct igmp6_mc_iter_state *state =igmp6_mc_seq_private (seq);seq_printf (seq, -"%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n" , +"%-4d %-15s %#p6 %5d %08X %ld\n" , state->dev->ifindex, state->dev->name, -NIP6 (im->mca_addr), + &im->mca_addr, im->mca_users, im->mca_flags, (im->mca_flags&MAF_TIMER_RUNNING ) ?jiffies_to_clock_t (im->mca_timer.expires-jiffies) :0 );
@@ -2591,10 +2591,10 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v) "Source Address", "INC", "EXC"); }else {seq_printf (seq, -"%3d %6.6s " NIP6_SEQFMT " " NIP6_SEQFMT " %6lu %6lu\n" , +"%3d %6.6s %#p6 %#p6 %6lu %6lu\n" , state->dev->ifindex, state->dev->name, -NIP6 (state->im->mca_addr), -NIP6 (psf->sf_addr), + &state->im->mca_addr, + &psf->sf_addr, psf->sf_count[MCAST_INCLUDE ], psf->sf_count[MCAST_EXCLUDE ]); }
net/ipv6/route.c +3 -6
@@ -2408,19 +2408,16 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg) {struct seq_file *m = p_arg; -seq_printf (m,NIP6_SEQFMT " %02x " ,NIP6 (rt->rt6i_dst.addr), - rt->rt6i_dst.plen); +seq_printf (m,"%#p6 %02x " , &rt->rt6i_dst.addr, rt->rt6i_dst.plen);#ifdef CONFIG_IPV6_SUBTREES -seq_printf (m,NIP6_SEQFMT " %02x " ,NIP6 (rt->rt6i_src.addr), - rt->rt6i_src.plen); +seq_printf (m,"%#p6 %02x " , &rt->rt6i_src.addr, rt->rt6i_src.plen);#else seq_puts (m,"00000000000000000000000000000000 00 " );#endif if (rt->rt6i_nexthop) { -seq_printf (m,NIP6_SEQFMT , -NIP6 (*((struct in6_addr *)rt->rt6i_nexthop->primary_key))); +seq_printf (m,"%#p6" , rt->rt6i_nexthop->primary_key); }else {seq_puts (m,"00000000000000000000000000000000" ); }
net/sunrpc/xprtsock.c +3 -4
@@ -365,10 +365,9 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, xprt->address_strings[RPC_DISPLAY_ALL ] = buf; buf =kzalloc (36 ,GFP_KERNEL ); -if (buf) { -snprintf (buf,36 ,NIP6_SEQFMT , -NIP6 (addr->sin6_addr)); - } +if (buf) +snprintf (buf,36 ,"%#p6" , &addr->sin6_addr); + xprt->address_strings[RPC_DISPLAY_HEX_ADDR ] = buf; buf =kzalloc (8 ,GFP_KERNEL );
Signature · 1 line
1.6.0.3.729.g6ea410
From: Harvey Harrison <[email protected]>
Date: Tue, 28 Oct 2008 12:53:36 -0700
Quoted 3 lines
The define in
kernel.hcan be done away with at a later time.Signed-off-by Harvey Harrison <[email protected]>
Applied.
Feel free to send me a removal patch now, the chance that there is an out of tree user is basically zero and even if it did exist we don't care.
PATCH 1/1 net: remove NIP6(), NIP6_FMT, NIP6_SEQFMT and final users
Open code NIP6_FMT in the one call inside sscanf and one user of NIP6() that could use %p6 in the netfilter code.
Signed-off-by Harvey Harrison <[email protected]>
--- include/linux/kernel.h | 12 ------------ net/bridge/netfilter/ebt_log.c | 6 ++---- net/sunrpc/svcauth_unix.c | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-)
include/linux/kernel.h +0 -12
@@ -357,18 +357,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte) ((unsigned char *)&addr)[3]#define NIPQUAD_FMT "%u.%u.%u.%u" -#define NIP6 (addr) \ - ntohs((addr).s6_addr16[0]), \ - ntohs((addr).s6_addr16[1]), \ - ntohs((addr).s6_addr16[2]), \ - ntohs((addr).s6_addr16[3]), \ - ntohs((addr).s6_addr16[4]), \ - ntohs((addr).s6_addr16[5]), \ - 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) \ ((unsigned char *)&addr)[3], \
net/bridge/netfilter/ebt_log.c +2 -4
@@ -133,10 +133,8 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,printk (" INCOMPLETE IPv6 header" ); goto out; } -printk (" IPv6 SRC=%x:%x:%x:%x:%x:%x:%x:%x " -"IPv6 DST=%x:%x:%x:%x:%x:%x:%x:%x, IPv6 " -"priority=0x%01X, Next Header=%d" ,NIP6 (ih->saddr), -NIP6 (ih->daddr), ih->priority, ih->nexthdr); +printk (" IPv6 SRC=%p6 IPv6 DST=%p6, IPv6 priority=0x%01X, Next Header=%d" , + &ih->saddr, &ih->daddr, ih->priority, ih->nexthdr); nexthdr = ih->nexthdr; offset_ph =ipv6_skip_exthdr (skb,sizeof (_iph), &nexthdr);if (offset_ph ==-1 )
net/sunrpc/svcauth_unix.c +1 -1
@@ -214,7 +214,7 @@ static int ip_map_parse(struct cache_detail *cd, addr.s6_addr32[2 ] =htonl (0xffff ); addr.s6_addr32[3 ] =htonl ((((((b1<<8 )|b2)<<8 )|b3)<<8 )|b4); - }else if (sscanf (buf,NIP6_FMT "%c" , + }else if (sscanf (buf,"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x%c" , &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) ==8 ) { addr.s6_addr16[0 ] =htons (b1); addr.s6_addr16[1 ] =htons (b2);
Signature · 1 line
1.6.0.3.756.gb776d
Re: [PATCH] net: remove NIP6(), NIP6_FMT, NIP6_SEQFMT and final users
From: Harvey Harrison <[email protected]>
Date: Tue, 28 Oct 2008 16:19:10 -0700
Quoted 4 lines
Open code
NIP6_FMTin the one call inside sscanf and one user ofNIP6()that could use %p6 in the netfilter code.Signed-off-by Harvey Harrison <[email protected]>
Applied, thanks!