Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752800AbaGJIYt (ORCPT ); Thu, 10 Jul 2014 04:24:49 -0400 Received: from mail-la0-f52.google.com ([209.85.215.52]:59417 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752222AbaGJISn (ORCPT ); Thu, 10 Jul 2014 04:18:43 -0400 From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Samuel Ortiz , Dragos Foianu Subject: [PATCH v7 20/33] net: irlan - set name assign type Date: Thu, 10 Jul 2014 10:17:25 +0200 Message-Id: <1404980258-30853-21-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-1-git-send-email-teg@jklm.no> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Tom Gundersen Cc: Samuel Ortiz Cc: Dragos Foianu --- include/net/irda/irlan_eth.h | 2 +- net/irda/irlan/irlan_common.c | 2 +- net/irda/irlan/irlan_eth.c | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/irda/irlan_eth.h b/include/net/irda/irlan_eth.h index de5c816..00fd2f8 100644 --- a/include/net/irda/irlan_eth.h +++ b/include/net/irda/irlan_eth.h @@ -25,7 +25,7 @@ #ifndef IRLAN_ETH_H #define IRLAN_ETH_H -struct net_device *alloc_irlandev(const char *name); +struct net_device *alloc_irlandev(const char *name, unsigned char name_assign_type); int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb); void irlan_eth_flow_indication( void *instance, void *sap, LOCAL_FLOW flow); diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c index 7ac4d1b..5a458b0 100644 --- a/net/irda/irlan/irlan_common.c +++ b/net/irda/irlan/irlan_common.c @@ -204,7 +204,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr) IRDA_DEBUG(2, "%s()\n", __func__ ); /* Create network device with irlan */ - dev = alloc_irlandev(eth ? "eth%d" : "irlan%d"); + dev = alloc_irlandev(eth ? "eth%d" : "irlan%d", NET_NAME_ENUM); if (!dev) return NULL; diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index dc13f1a..b62a822 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c @@ -94,10 +94,11 @@ static void irlan_eth_setup(struct net_device *dev) * Allocate network device and control block * */ -struct net_device *alloc_irlandev(const char *name) +struct net_device *alloc_irlandev(const char *name, + unsigned char name_assign_type) { - return alloc_netdev(sizeof(struct irlan_cb), name, NET_NAME_UNKNOWN, - irlan_eth_setup); + return alloc_netdev(sizeof(struct irlan_cb), name, + name_assign_type, irlan_eth_setup); } /* -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/