diff options
| author | Forest Bond | 2010-04-17 17:03:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:35:56 +0200 |
| commit | c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934 (patch) | |
| tree | f837a864bfd1909e52c15244d8a3109865826f9e /drivers/staging/vt6656/hostap.c | |
| parent | Staging: vt6656: incorporated ETH_ALEN macro instead of custom one (diff) | |
| download | kernel-qcow2-linux-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.tar.gz kernel-qcow2-linux-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.tar.xz kernel-qcow2-linux-c30d7973f22ea3f8b3e5d1d7215b3f2ff8f5e934.zip | |
Staging: vt6656: Rename hostap_set_hostapd, hostap_iotctl.
The functions hostap_set_hostapd, hostap_iotctl clashed with functions of the
same name with CONFIG_HOSTAP=y and/or CONFIG_VT6655=y.
Signed-off-by: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/hostap.c')
| -rw-r--r-- | drivers/staging/vt6656/hostap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c index 1078d616c497..ca007c30e0ab 100644 --- a/drivers/staging/vt6656/hostap.c +++ b/drivers/staging/vt6656/hostap.c @@ -178,7 +178,7 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked) * */ -int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked) +int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked) { if (val < 0 || val > 1) return -EINVAL; @@ -744,7 +744,7 @@ static int hostap_get_encryption(PSDevice pDevice, /* * Description: - * hostap_ioctl main function supported for hostap deamon. + * vt6656_hostap_ioctl main function supported for hostap deamon. * * Parameters: * In: @@ -756,7 +756,7 @@ static int hostap_get_encryption(PSDevice pDevice, * */ -int hostap_ioctl(PSDevice pDevice, struct iw_point *p) +int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p) { struct viawget_hostapd_param *param; int ret = 0; @@ -844,7 +844,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p) return -EOPNOTSUPP; default: - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n", + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6656_hostap_ioctl: unknown cmd=%d\n", (int)param->cmd); return -EOPNOTSUPP; break; |