From 7055a0751ae88b0f6e7997a70f323d370a6b4774 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 24 Nov 2012 14:44:29 +0000 Subject: [PATCH] staging: vt6656: cleanup of device_ioctl/net_device_stats Also remove IOCTL_CMD_TEST. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/main_usb.c | 55 +++++++------------------------ 1 file changed, 12 insertions(+), 43 deletions(-) diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index a667e39b0eb4..4a0f9dc76e62 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1502,66 +1502,35 @@ static void device_set_multi(struct net_device *dev) { } - -static struct net_device_stats *device_get_stats(struct net_device *dev) { +static struct net_device_stats *device_get_stats(struct net_device *dev) +{ PSDevice pDevice=(PSDevice) netdev_priv(dev); return &pDevice->stats; } - -static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { +static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +{ PSDevice pDevice = (PSDevice)netdev_priv(dev); - PSMgmtObject pMgmt = &pDevice->sMgmtObj; - PSCmdRequest pReq; struct iwreq *wrq = (struct iwreq *) rq; int rc = 0; - if (pMgmt == NULL) { - rc = -EFAULT; - return rc; - } - - switch(cmd) { - + switch (cmd) { - case IOCTL_CMD_TEST: + case IOCTL_CMD_HOSTAPD: - if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) { - rc = -EFAULT; - break; - } else { - rc = 0; - } - pReq = (PSCmdRequest)rq; - - //20080130-01, by Mike Liu - // if(pDevice->bLinkPass==TRUE) - pReq->wResult = MAGIC_CODE; //Linking status:0x3142 - //20080130-02, by Mike Liu - // else - // pReq->wResult = MAGIC_CODE+1; //disconnect status:0x3143 - break; - - case IOCTL_CMD_HOSTAPD: - - if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) { - rc = -EFAULT; - break; - } else { - rc = 0; - } + if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) + rc = -EFAULT; rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data); - break; + break; case SIOCETHTOOL: - return ethtool_ioctl(dev, (void *) rq->ifr_data); - - } + return ethtool_ioctl(dev, (void *) rq->ifr_data); + } - return rc; + return rc; } -- 2.20.1