Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7055a075 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: cleanup of device_ioctl/net_device_stats 



Also remove IOCTL_CMD_TEST.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b250c38

drivers/staging/vt6656/main_usb.c

+12 −43
Original line number Diff line number Diff line
@@ -1502,55 +1502,25 @@ 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) {





    case IOCTL_CMD_TEST:



		if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {

		    rc = -EFAULT;

		    break;

		} else {

		    rc = 0;

		}

        pReq = (PSCmdRequest)rq;



   //20080130-01,<Remark> by Mike Liu

      // if(pDevice->bLinkPass==TRUE)

          pReq->wResult = MAGIC_CODE;         //Linking status:0x3142

   //20080130-02,<Remark> by Mike Liu

      //  else

      //	 pReq->wResult = MAGIC_CODE+1;    //disconnect status:0x3143

        break;



	case IOCTL_CMD_HOSTAPD:



		if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {

		if (!(pDevice->flags & DEVICE_FLAGS_OPENED))

			rc = -EFAULT;

		    break;

		} else {

		    rc = 0;

		}



		rc = vt6656_hostap_ioctl(pDevice, &wrq->u.data);

		break;
@@ -1560,7 +1530,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { 


	}





	return rc;

}