From patchwork Thu Jul 17 11:28:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 371088 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 4C48E140097 for ; Thu, 17 Jul 2014 21:32:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756043AbaGQLcn (ORCPT ); Thu, 17 Jul 2014 07:32:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11220 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755856AbaGQLcl (ORCPT ); Thu, 17 Jul 2014 07:32:41 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6HBWcsv017590 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Jul 2014 07:32:39 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6HBWYZW031939; Thu, 17 Jul 2014 07:32:38 -0400 From: Veaceslav Falico To: netdev@vger.kernel.org Cc: Veaceslav Falico , "David S. Miller" Subject: [PATCH net-next 1/2] net: use dev->name in netdev_pr* when it's available Date: Thu, 17 Jul 2014 13:28:10 +0200 Message-Id: <1405596491-5881-2-git-send-email-vfalico@gmail.com> In-Reply-To: <1405596491-5881-1-git-send-email-vfalico@gmail.com> References: <1405596491-5881-1-git-send-email-vfalico@gmail.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org netdev_name() returns dev->name only when the net_device is in NETREG_REGISTERED state. However, dev->name is always populated on creation, so we can easily use it. The only caveat is that the device still has a name of type "eth%d", in which case we cannot use this name as it'll change in the nearest future, thus return "unnamed net_device". CC: "David S. Miller" Signed-off-by: Veaceslav Falico --- include/linux/netdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 15ed750..cde12a3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3383,8 +3383,8 @@ extern struct pernet_operations __net_initdata loopback_net_ops; static inline const char *netdev_name(const struct net_device *dev) { - if (dev->reg_state != NETREG_REGISTERED) - return "(unregistered net_device)"; + if (strchr(dev->name, '%')) + return "(unnamed net_device)"; return dev->name; }