Signed-off-by: Tom Gundersen <t...@jklm.no>
Cc: Samuel Ortiz <sam...@sortiz.org>
Cc: Dragos Foianu <dragos.foi...@gmail.com>
---
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
