lkml.org 
[lkml]   [2010]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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>
    ---
    drivers/staging/vt6655/device_main.c | 4 ++--
    drivers/staging/vt6655/hostap.c | 8 ++++----
    drivers/staging/vt6655/hostap.h | 4 ++--
    drivers/staging/vt6655/ioctl.c | 4 ++--
    4 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
    index 18f4dfe..ef3135c 100644
    --- a/drivers/staging/vt6655/device_main.c
    +++ b/drivers/staging/vt6655/device_main.c
    @@ -1242,7 +1242,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);
    @@ -3523,7 +3523,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:
    diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
    index 58abf44..9e07a40 100644
    --- a/drivers/staging/vt6655/hostap.c
    +++ b/drivers/staging/vt6655/hostap.c
    @@ -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)
    return -EINVAL;
    @@ -746,7 +746,7 @@ static int hostap_get_encryption(PSDevice pDevice,

    /*
    * Description:
    - * hostap_ioctl main function supported for hostap deamon.
    + * vt6655_hostap_ioctl main function supported for hostap deamon.
    *
    * Parameters:
    * 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;
    int ret = 0;
    @@ -846,7 +846,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 "vt6655_hostap_ioctl: unknown cmd=%d\n",
    (int)param->cmd);
    return -EOPNOTSUPP;
    break;
    diff --git a/drivers/staging/vt6655/hostap.h b/drivers/staging/vt6655/hostap.h
    index 8fd667b..55db555 100644
    --- a/drivers/staging/vt6655/hostap.h
    +++ b/drivers/staging/vt6655/hostap.h
    @@ -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 vt6655_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
    +int vt6655_hostap_ioctl(PSDevice pDevice, struct iw_point *p);

    #endif // __HOSTAP_H__

    diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
    index d9a5fd2..f29ed9f 100644
    --- a/drivers/staging/vt6655/ioctl.c
    +++ b/drivers/staging/vt6655/ioctl.c
    @@ -429,7 +429,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
    break;
    };
    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");
    }
    else {
    @@ -438,7 +438,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
    }
    }
    else {
    - hostap_set_hostapd(pDevice, 0, 1);
    + vt6655_hostap_set_hostapd(pDevice, 0, 1);
    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
    }

    --
    1.6.0.4[unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2010-04-17 17:05    [W:0.023 / U:359.780 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site