Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7f635d0d1bf84ad7a0032cbce9d902b9384c48b7

Authored by Joe Perches
Committed by Patrick McHardy
1 parent a79e7ac4ad
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

netfilter: xt_osf: change %pi4 to %pI4 

commit 8a27f7c90ffcb791eed7574922b51fb60b08fc89
changed the output style of %pi4 to use fixed
width leading zero IP addresses "001.002.003.004".

It's useful when printing multiple lines of
addresses, but was a change in output style for
some existing uses.

Using %pI4 restores the previous output style.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

net/netfilter/xt_osf.c
Diff comments   View file @ 7f635d0
... ... @@ -334,7 +334,7 @@
334 334 if (info->flags & XT_OSF_LOG)
335 335 nf_log_packet(p->family, p->hooknum, skb,
336 336 p->in, p->out, NULL,
337   - "%s [%s:%s] : %pi4:%d -> %pi4:%d hops=%d\n",
  337 + "%s [%s:%s] : %pI4:%d -> %pI4:%d hops=%d\n",
338 338 f->genre, f->version, f->subtype,
339 339 &ip->saddr, ntohs(tcp->source),
340 340 &ip->daddr, ntohs(tcp->dest),
... ... @@ -349,7 +349,7 @@
349 349  
350 350 if (!fcount && (info->flags & XT_OSF_LOG))
351 351 nf_log_packet(p->family, p->hooknum, skb, p->in, p->out, NULL,
352   - "Remote OS is not known: %pi4:%u -> %pi4:%u\n",
  352 + "Remote OS is not known: %pI4:%u -> %pI4:%u\n",
353 353 &ip->saddr, ntohs(tcp->source),
354 354 &ip->daddr, ntohs(tcp->dest));
355 355