leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: vt6655: Rename hostap_set_hostapd, hostap_iotctl.

Browse Source 
The functions hostap_set_hostapd, hostap_iotctl clashed with functions of the
same name with CONFIG_HOSTAP=y and/or CONFIG_VT6656=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:47 -04:00 committed by Greg Kroah-Hartman
parent c30d7973f2
commit ecf739e695
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vt6655/device_main.c
View File

@ -1243,7 +1243,7 @@ device_release_WPADEV(pDevice);
} }
#ifdef HOSTAP #ifdef HOSTAP
if (dev) if (dev)
hostap_set_hostapd(pDevice, 0, 0); vt6655_hostap_set_hostapd(pDevice, 0, 0);
#endif #endif
if (dev) if (dev)
unregister_netdev(dev); unregister_netdev(dev);
@ -3524,7 +3524,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
case IOCTL_CMD_HOSTAPD: case IOCTL_CMD_HOSTAPD:
rc = hostap_ioctl(pDevice, &wrq->u.data); rc = vt6655_hostap_ioctl(pDevice, &wrq->u.data);
break; break;
case IOCTL_CMD_WPA: case IOCTL_CMD_WPA:

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

@ -183,7 +183,7 @@ KeyvInitTable(&pDevice->sKey,pDevice->PortOffset);
* *
*/ */
int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked) int vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
{ {
if (val < 0 || val > 1) if (val < 0 || val > 1)
return -EINVAL; return -EINVAL;
@ -746,7 +746,7 @@ static int hostap_get_encryption(PSDevice pDevice,
/* /*
* Description: * Description:
* hostap_ioctl main function supported for hostap deamon. * vt6655_hostap_ioctl main function supported for hostap deamon.
* *
* Parameters: * Parameters:
* In: * In:
@ -758,7 +758,7 @@ static int hostap_get_encryption(PSDevice pDevice,
* *
*/ */
int hostap_ioctl(PSDevice pDevice, struct iw_point *p) int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
{ {
struct viawget_hostapd_param *param; struct viawget_hostapd_param *param;
int ret = 0; int ret = 0;
@ -846,7 +846,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
return -EOPNOTSUPP; return -EOPNOTSUPP;
default: default:
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vt6655_hostap_ioctl: unknown cmd=%d\n",
(int)param->cmd); (int)param->cmd);
return -EOPNOTSUPP; return -EOPNOTSUPP;
break; break;

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

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

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

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