From patchwork Wed Jul 4 08:45:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1155151 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0114A40ABE for ; Wed, 4 Jul 2012 08:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756986Ab2GDIqg (ORCPT ); Wed, 4 Jul 2012 04:46:36 -0400 Received: from mga11.intel.com ([192.55.52.93]:7380 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751429Ab2GDIqX (ORCPT ); Wed, 4 Jul 2012 04:46:23 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 04 Jul 2012 01:46:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="173277829" Received: from smile.fi.intel.com (HELO smile) ([10.237.72.164]) by fmsmga001.fm.intel.com with ESMTP; 04 Jul 2012 01:46:14 -0700 Received: from andy by smile with local (Exim 4.80) (envelope-from ) id 1SmLDh-0001Gg-14; Wed, 04 Jul 2012 11:45:57 +0300 From: Andy Shevchenko To: Andrew Morton , proski@gnu.org, Andrei Emeltchenko , linux-wireless@vger.kernel.org, LKML , joe@perches.com, Larry Finger Cc: Andy Shevchenko Subject: [PATCHv3 1/3] lib: printf: update documentation to cover all of %p[Mm][FR] Date: Wed, 4 Jul 2012 11:45:50 +0300 Message-Id: <1341391552-4842-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341341280.2012.3.camel@joe2Laptop> References: <1341341280.2012.3.camel@joe2Laptop> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Signed-off-by: Andy Shevchenko Acked-by: Andrei Emeltchenko --- Documentation/printk-formats.txt | 1 + lib/vsprintf.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt index d8d168fa..90ff4d7 100644 --- a/Documentation/printk-formats.txt +++ b/Documentation/printk-formats.txt @@ -59,6 +59,7 @@ MAC/FDDI addresses: %pMR 05:04:03:02:01:00 %pMF 00-01-02-03-04-05 %pm 000102030405 + %pmR 050403020100 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 diff --git a/lib/vsprintf.c b/lib/vsprintf.c index a0b5f15..e500158 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -946,7 +946,7 @@ int kptr_restrict __read_mostly; * - '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 * 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 * 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 @@ -1287,7 +1287,10 @@ qualifier: * %pR output the address range in a struct resource with decoded flags * %pr output the address range in a struct resource with raw flags * %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 + * %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 with leading zeros * %pI6 print an IPv6 address with colons