diff options
Diffstat (limited to 'drivers/staging/vt6656/hostap.c')
| -rw-r--r-- | drivers/staging/vt6656/hostap.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c index 682002a5b8d..0a73d4060ee 100644 --- a/drivers/staging/vt6656/hostap.c +++ b/drivers/staging/vt6656/hostap.c @@ -18,7 +18,7 @@ * * File: hostap.c * - * Purpose: handle hostap deamon ioctl input/out functions + * Purpose: handle hostap daemon ioctl input/out functions * * Author: Lyndon Chen * @@ -48,7 +48,7 @@ static int msglevel =MSG_LEVEL_INFO; /* * Description: - * register net_device (AP) for hostap deamon + * register net_device (AP) for hostap daemon * * Parameters: * In: @@ -176,7 +176,7 @@ int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked) /* * Description: - * remove station function supported for hostap deamon + * remove station function supported for hostap daemon * * Parameters: * In: @@ -204,7 +204,7 @@ static int hostap_remove_sta(PSDevice pDevice, /* * Description: - * add a station from hostap deamon + * add a station from hostap daemon * * Parameters: * In: @@ -439,9 +439,7 @@ static int hostap_set_encryption(PSDevice pDevice, return -EINVAL; } - if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && - param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && - param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) { + if (is_broadcast_ether_addr(param->sta_addr)) { if (param->u.crypt.idx >= MAX_GROUP_KEY) return -EINVAL; iNodeIndex = 0; @@ -663,9 +661,7 @@ static int hostap_get_encryption(PSDevice pDevice, param->u.crypt.err = 0; - if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && - param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff && - param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) { + if (is_broadcast_ether_addr(param->sta_addr)) { iNodeIndex = 0; } else { if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &iNodeIndex) == FALSE) { @@ -686,7 +682,7 @@ static int hostap_get_encryption(PSDevice pDevice, /* * Description: - * vt6656_hostap_ioctl main function supported for hostap deamon. + * vt6656_hostap_ioctl main function supported for hostap daemon. * * Parameters: * In: @@ -732,8 +728,8 @@ int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p) break; case VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR \n"); - return -EOPNOTSUPP; - break; + ret = -EOPNOTSUPP; + goto out; case VIAWGET_HOSTAPD_FLUSH: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_FLUSH \n"); spin_lock_irq(&pDevice->lock); @@ -777,13 +773,13 @@ int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p) case VIAWGET_HOSTAPD_STA_CLEAR_STATS: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_STA_CLEAR_STATS \n"); - return -EOPNOTSUPP; - + ret = -EOPNOTSUPP; + goto out; default: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6656_hostap_ioctl: unknown cmd=%d\n", (int)param->cmd); - return -EOPNOTSUPP; - break; + ret = -EOPNOTSUPP; + goto out; } |