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

hamachi: use ndo_siocdevprivate 



hamachi has one command that overloads the ifreq argument
and requires a conversion to ndo_siocdevprivate in order to
make compat mode work, so split it from ndo_ioctl.

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

drivers/net/ethernet/packetengines/hamachi.c

+38 −25
Original line number Diff line number Diff line
@@ -546,7 +546,9 @@ static int read_eeprom(void __iomem *ioaddr, int location); 
static int mdio_read(struct net_device *dev, int phy_id, int location);

static void mdio_write(struct net_device *dev, int phy_id, int location, int value);

static int hamachi_open(struct net_device *dev);

static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq,

				  void __user *data, int cmd);

static void hamachi_timer(struct timer_list *t);

static void hamachi_tx_timeout(struct net_device *dev, unsigned int txqueue);

static void hamachi_init_ring(struct net_device *dev);
@@ -571,7 +573,8 @@ static const struct net_device_ops hamachi_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_tx_timeout		= hamachi_tx_timeout,

	.ndo_do_ioctl		= netdev_ioctl,

	.ndo_do_ioctl		= hamachi_ioctl,

	.ndo_siocdevprivate	= hamachi_siocdevprivate,

};
@@ -1867,17 +1870,19 @@ static const struct ethtool_ops ethtool_ops_no_mii = { 
	.get_drvinfo = hamachi_get_drvinfo,

};



static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

/* private ioctl: set rx,tx intr params */

static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq,

				  void __user *data, int cmd)

{

	struct hamachi_private *np = netdev_priv(dev);

	struct mii_ioctl_data *data = if_mii(rq);

	int rc;

	u32 *d = (u32 *)&rq->ifr_ifru;



	if (!netif_running(dev))

		return -EINVAL;



	if (cmd == (SIOCDEVPRIVATE+3)) { /* set rx,tx intr params */

		u32 *d = (u32 *)&rq->ifr_ifru;

	if (cmd != SIOCDEVPRIVATE + 3)

		return -EOPNOTSUPP;



	/* Should add this check here or an ordinary user can do nasty

	 * things. -KDU

	 *
@@ -1890,14 +1895,22 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
	printk(KERN_NOTICE "%s: tx %08x, rx %08x intr\n", dev->name,

	       (u32)readl(np->base + TxIntrCtrl),

	       (u32)readl(np->base + RxIntrCtrl));

		rc = 0;



	return 0;

}



	else {

static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)

{

	struct hamachi_private *np = netdev_priv(dev);

	struct mii_ioctl_data *data = if_mii(rq);

	int rc;



	if (!netif_running(dev))

		return -EINVAL;



	spin_lock_irq(&np->lock);

	rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL);

	spin_unlock_irq(&np->lock);

	}



	return rc;

}