@@ -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);
@@ -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;
@@ -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);
}
/*
Signed-off-by: Tom Gundersen <teg@jklm.no> Cc: Samuel Ortiz <samuel@sortiz.org> Cc: Dragos Foianu <dragos.foianu@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(-)