diff options
| author |   Forest Bond <forest@alittletooquiet.net> | 2010-04-17 11:03:47 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:56 -0700 |
| commit | ecf739e695d5aa404326100c0ba93c211e87a0fe (patch) | |
| tree | 1e7ad5592e559b952376372a0344ab96724c2c18 /drivers/staging/vt6655/device_main.c | |
| parent | Staging: vt6656: Rename hostap_set_hostapd, hostap_iotctl. (diff) | |
| download | linux-dev-ecf739e695d5aa404326100c0ba93c211e87a0fe.tar.xz linux-dev-ecf739e695d5aa404326100c0ba93c211e87a0fe.zip | |
Staging: vt6655: 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_VT6656=y.
Signed-off-by: Forest Bond <forest@alittletooquiet.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 50f02ee0b112..f1d70e133d16 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1243,7 +1243,7 @@ device_release_WPADEV(pDevice); } #ifdef HOSTAP if (dev) - hostap_set_hostapd(pDevice, 0, 0); + vt6655_hostap_set_hostapd(pDevice, 0, 0); #endif if (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: - rc = hostap_ioctl(pDevice, &wrq->u.data); + rc = vt6655_hostap_ioctl(pDevice, &wrq->u.data); break; case IOCTL_CMD_WPA: |