diff options
Diffstat (limited to 'drivers/staging/rtl8712/os_intfs.c')
| -rw-r--r-- | drivers/staging/rtl8712/os_intfs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index 6e776e5433f6..5d551a1ba3dc 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -122,13 +122,11 @@ module_param(low_power, int, 0644); MODULE_PARM_DESC(ifname, " Net interface name, wlan%d=default"); MODULE_PARM_DESC(initmac, "MAC-Address, default: use FUSE"); -static uint loadparam(struct _adapter *padapter, struct net_device *pnetdev); static int netdev_open(struct net_device *pnetdev); static int netdev_close(struct net_device *pnetdev); -static uint loadparam(struct _adapter *padapter, struct net_device *pnetdev) +static void loadparam(struct _adapter *padapter, struct net_device *pnetdev) { - uint status = _SUCCESS; struct registry_priv *registry_par = &padapter->registrypriv; registry_par->chip_version = (u8)chip_version; @@ -172,7 +170,6 @@ static uint loadparam(struct _adapter *padapter, struct net_device *pnetdev) registry_par->low_power = (u8)low_power; registry_par->wifi_test = (u8) wifi_test; r8712_initmac = initmac; - return status; } static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p) @@ -181,7 +178,7 @@ static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p) struct sockaddr *addr = p; if (padapter->bup == false) - memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); + ether_addr_copy(pnetdev->dev_addr, addr->sa_data); return 0; } @@ -228,7 +225,6 @@ struct net_device *r8712_init_netdev(void) pnetdev->watchdog_timeo = HZ; /* 1 second timeout */ pnetdev->wireless_handlers = (struct iw_handler_def *) &r871x_handlers_def; - /*step 2.*/ loadparam(padapter, pnetdev); netif_carrier_off(pnetdev); padapter->pid = 0; /* Initial the PID value used for HW PBC.*/ |