From patchwork Mon Oct 27 19:59:02 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Harrison X-Patchwork-Id: 5953 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8A0D7DDDE0 for ; Tue, 28 Oct 2008 07:01:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752741AbYJ0UBr (ORCPT ); Mon, 27 Oct 2008 16:01:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752664AbYJ0UBq (ORCPT ); Mon, 27 Oct 2008 16:01:46 -0400 Received: from yx-out-2324.google.com ([74.125.44.28]:2260 "EHLO yx-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752611AbYJ0UBp (ORCPT ); Mon, 27 Oct 2008 16:01:45 -0400 Received: by yx-out-2324.google.com with SMTP id 8so564671yxm.1 for ; Mon, 27 Oct 2008 13:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=/0sHuXVCCTtmpCwAt7Ec0/u3UOK6PKWy8TN7HfeTqYY=; b=T8nwP3WheQEefOgkDtOp5cBRUgQesGfgQOXgt4izOv3tRwXE1BQirraO0t49ef3wXn xF8s4DffUsoBEWKItXQcNpCWjnaOPFNgtZ0RVvOLtIAYLqAxyGOr5qmQ9bCAvp9YDIr1 1e5e/+5eSEdKU3ysaODf2lIENtx3XICyJaWn4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=pGeYUecEi1tSelRdxMTrTvWaR3Pr1nO+MsUirV6TQtom8F5qtf7QhFxMMCI8JAdPHW Z2W2GzSHmd8OaPYUIBlgty6jZbsi8CyMs8mVhrI1iWp0DpQNjAfsImkVXFY3/mW7xM9l ERFtqy891gPUfLaCUJQFjZM2HOtQ64NVjywQU= Received: by 10.65.160.7 with SMTP id m7mr6924696qbo.16.1225137702626; Mon, 27 Oct 2008 13:01:42 -0700 (PDT) Received: from ?192.168.101.231? ( [207.61.39.186]) by mx.google.com with ESMTPS id k30sm696061qba.4.2008.10.27.13.01.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 27 Oct 2008 13:01:42 -0700 (PDT) Subject: [RFC PATCHv3] printk: add %pM format specifier for MAC addresses From: Harvey Harrison To: David Miller Cc: johannes@sipsolutions.net, anders@anduras.de, netdev@vger.kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <20081027.123805.134354592.davem@davemloft.net> References: <1225067465.5672.1.camel@brick> <1225090765.3746.7.camel@johannes.berg> <1225124904.5440.1.camel@brick> <20081027.123805.134354592.davem@davemloft.net> Date: Mon, 27 Oct 2008 12:59:02 -0700 Message-Id: <1225137542.5396.10.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add format specifiers for printing out six colon-separated bytes: MAC addresses (%pM): xx:xx:xx:xx:xx:xx %#pM is also supported and omits the colon separators. Signed-off-by: Harvey Harrison --- Dave, this passes testing here, but I was wondering if perhaps it would be better to allow a length to be specified as well, which would allow: %pM6 for mac addresses, etc as there seem a lot of places in kernel that print out a list of colon separated bytes of various lengths. But if that was added, it may be more natural to call it %pB (bytes) %pW (words) Then mac addresses would be %pB6 IPv6 addresses would be %pW8 (8 words) It would be trivial to add, but maybe I'm overthinking this. In any event, this patch only adds %pM for mac addresses. lib/vsprintf.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index a013bbc..2025305 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -581,6 +581,23 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie return string(buf, end, sym, field_width, precision, flags); } +static char *mac_address(char *buf, char *end, u8 *addr, int field_width, + int precision, int flags) +{ + char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */ + char *p = mac_addr; + int i; + + for (i = 0; i < 6; i++) { + p = pack_hex_byte(p, addr[i]); + if (!(flags & SPECIAL) && i != 5) + *p++ = ':'; + } + *p = '\0'; + + return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL); +} + /* * Show a '%p' thing. A kernel extension is that the '%p' is followed * by an extra set of alphanumeric characters that are extended format @@ -592,6 +609,8 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie * - 'S' For symbolic direct pointers * - 'R' For a struct resource pointer, it prints the range of * addresses (not the name nor the flags) + * - 'M' For a 6-byte MAC address, it prints the address in the + * usual colon-separated hex notation * * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 * function pointers are really function descriptors, which contain a @@ -607,6 +626,8 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field return symbol_string(buf, end, ptr, field_width, precision, flags); case 'R': return resource_string(buf, end, ptr, field_width, precision, flags); + case 'M': + return mac_address(buf, end, ptr, field_width, precision, flags); } flags |= SMALL; if (field_width == -1) {