Commit cc0aa831 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

sb1000: use ndo_siocdevprivate 



The private sb1000 ioctl commands all work correctly in
compat mode. Change the to ndo_siocdevprivate as a cleanup.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81a68110

drivers/net/sb1000.c

+11 −9
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ struct sb1000_private { 
/* prototypes for Linux interface */

extern int sb1000_probe(struct net_device *dev);

static int sb1000_open(struct net_device *dev);

static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);

static int sb1000_siocdevprivate(struct net_device *dev, struct ifreq *ifr,

				 void __user *data, int cmd);

static netdev_tx_t sb1000_start_xmit(struct sk_buff *skb,

				     struct net_device *dev);

static irqreturn_t sb1000_interrupt(int irq, void *dev_id);
@@ -135,7 +136,7 @@ MODULE_DEVICE_TABLE(pnp, sb1000_pnp_ids); 
static const struct net_device_ops sb1000_netdev_ops = {

	.ndo_open		= sb1000_open,

	.ndo_start_xmit		= sb1000_start_xmit,

	.ndo_do_ioctl		= sb1000_dev_ioctl,

	.ndo_siocdevprivate	= sb1000_siocdevprivate,

	.ndo_stop		= sb1000_close,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,
@@ -987,7 +988,8 @@ sb1000_open(struct net_device *dev) 
	return 0;					/* Always succeed */

}



static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

static int sb1000_siocdevprivate(struct net_device *dev, struct ifreq *ifr,

				 void __user *data, int cmd)

{

	char* name;

	unsigned char version[2];
@@ -1011,7 +1013,7 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
		stats[2] = dev->stats.rx_packets;

		stats[3] = dev->stats.rx_errors;

		stats[4] = dev->stats.rx_dropped;

		if(copy_to_user(ifr->ifr_data, stats, sizeof(stats)))

		if (copy_to_user(data, stats, sizeof(stats)))

			return -EFAULT;

		status = 0;

		break;
@@ -1019,21 +1021,21 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	case SIOCGCMFIRMWARE:		/* get firmware version */

		if ((status = sb1000_get_firmware_version(ioaddr, name, version, 1)))

			return status;

		if(copy_to_user(ifr->ifr_data, version, sizeof(version)))

		if (copy_to_user(data, version, sizeof(version)))

			return -EFAULT;

		break;



	case SIOCGCMFREQUENCY:		/* get frequency */

		if ((status = sb1000_get_frequency(ioaddr, name, &frequency)))

			return status;

		if(put_user(frequency, (int __user *) ifr->ifr_data))

		if (put_user(frequency, (int __user *)data))

			return -EFAULT;

		break;



	case SIOCSCMFREQUENCY:		/* set frequency */

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

		if(get_user(frequency, (int __user *) ifr->ifr_data))

		if (get_user(frequency, (int __user *)data))

			return -EFAULT;

		if ((status = sb1000_set_frequency(ioaddr, name, frequency)))

			return status;
@@ -1042,14 +1044,14 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	case SIOCGCMPIDS:			/* get PIDs */

		if ((status = sb1000_get_PIDs(ioaddr, name, PID)))

			return status;

		if(copy_to_user(ifr->ifr_data, PID, sizeof(PID)))

		if (copy_to_user(data, PID, sizeof(PID)))

			return -EFAULT;

		break;



	case SIOCSCMPIDS:			/* set PIDs */

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

		if(copy_from_user(PID, ifr->ifr_data, sizeof(PID)))

		if (copy_from_user(PID, data, sizeof(PID)))

			return -EFAULT;

		if ((status = sb1000_set_PIDs(ioaddr, name, PID)))

			return status;