Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b071195d authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 689afa7d

fs/cifs/cifs_spnego.c

+1 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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]);

	}