diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_main.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 15f0fad39ad..a1257c92afc 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c @@ -66,7 +66,7 @@ struct net_device * hostap_add_interface(struct local_info *local,  	list_add(&iface->list, &local->hostap_interfaces);  	mdev = local->dev; -	memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN); +	eth_hw_addr_inherit(dev, mdev);  	dev->base_addr = mdev->base_addr;  	dev->irq = mdev->irq;  	dev->mem_start = mdev->mem_start; @@ -667,7 +667,7 @@ static int prism2_open(struct net_device *dev)  	if (local->no_pri) {  		printk(KERN_DEBUG "%s: could not set interface UP - no PRI "  		       "f/w\n", dev->name); -		return 1; +		return -ENODEV;  	}  	if ((local->func->card_present && !local->func->card_present(local)) || @@ -682,7 +682,7 @@ static int prism2_open(struct net_device *dev)  		printk(KERN_WARNING "%s: could not enable MAC port\n",  		       dev->name);  		prism2_close(dev); -		return 1; +		return -ENODEV;  	}  	if (!local->dev_enabled)  		prism2_callback(local, PRISM2_CALLBACK_ENABLE);  | 
