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

Commit 7c59154e authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

lib/vsprintf: update documentation to cover all of %p[Mm][FR] 



Acked-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f4000516

Documentation/printk-formats.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ MAC/FDDI addresses: 
	%pMR	05:04:03:02:01:00

	%pMR	05:04:03:02:01:00

	%pMF	00-01-02-03-04-05

	%pMF	00-01-02-03-04-05

	%pm	000102030405

	%pm	000102030405

	%pmR	050403020100





	For printing 6-byte MAC/FDDI addresses in hex notation. The 'M' and 'm'

	For printing 6-byte MAC/FDDI addresses in hex notation. The 'M' and 'm'

	specifiers result in a printed address with ('M') or without ('m') byte

	specifiers result in a printed address with ('M') or without ('m') byte

lib/vsprintf.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -987,7 +987,7 @@ int kptr_restrict __read_mostly; 
 * - 'm' For a 6-byte MAC address, it prints the hex address without colons

 * - 'm' For a 6-byte MAC address, it prints the hex address without colons

 * - 'MF' For a 6-byte MAC FDDI address, it prints the address

 * - 'MF' For a 6-byte MAC FDDI address, it prints the address

 *       with a dash-separated hex notation

 *       with a dash-separated hex notation

 * - '[mM]R For a 6-byte MAC address, Reverse order (Bluetooth)

 * - '[mM]R' For a 6-byte MAC address, Reverse order (Bluetooth)

 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way

 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way

 *       IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)

 *       IPv4 uses dot-separated decimal without leading 0's (1.2.3.4)

 *       IPv6 uses colon separated network-order 16 bit hex with leading 0's

 *       IPv6 uses colon separated network-order 16 bit hex with leading 0's
@@ -1338,7 +1338,10 @@ qualifier: 
 * %pR output the address range in a struct resource with decoded flags

 * %pR output the address range in a struct resource with decoded flags

 * %pr output the address range in a struct resource with raw flags

 * %pr output the address range in a struct resource with raw flags

 * %pM output a 6-byte MAC address with colons

 * %pM output a 6-byte MAC address with colons

 * %pMR output a 6-byte MAC address with colons in reversed order

 * %pMF output a 6-byte MAC address with dashes

 * %pm output a 6-byte MAC address without colons

 * %pm output a 6-byte MAC address without colons

 * %pmR output a 6-byte MAC address without colons in reversed order

 * %pI4 print an IPv4 address without leading zeros

 * %pI4 print an IPv4 address without leading zeros

 * %pi4 print an IPv4 address with leading zeros

 * %pi4 print an IPv4 address with leading zeros

 * %pI6 print an IPv6 address with colons

 * %pI6 print an IPv6 address with colons