dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Forest Bond 2010-04-17 11:03:38 -04:00 committed by Greg Kroah-Hartman
parent 9a0e756c52
commit c30d7973f2
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/vt6656/hostap.c
View File

@ -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;

4
drivers/staging/vt6656/hostap.h
View File

@ -61,8 +61,8 @@
#define ARPHRD_IEEE80211 801
#endif
int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p);
#endif // __HOSTAP_H__

4
drivers/staging/vt6656/ioctl.c
View File

@ -412,7 +412,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
break;
};
if (sValue.dwValue == 1) {
if (hostap_set_hostapd(pDevice, 1, 1) == 0){
if (vt6656_hostap_set_hostapd(pDevice, 1, 1) == 0){
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");
}
else {
@ -421,7 +421,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
}
}
else {
hostap_set_hostapd(pDevice, 0, 1);
vt6656_hostap_set_hostapd(pDevice, 0, 1);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
}

2
drivers/staging/vt6656/main_usb.c
View File

@ -2069,7 +2069,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
rc = 0;
}
rc = hostap_ioctl(pDevice, &wrq->u.data);
rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data);
break;
case IOCTL_CMD_WPA: