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

Commit d3757472 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jeff Garzik
Browse files

[PATCH] xtensa platform-iss network: remove no-op ioctl handler 



If the driver ever wants to add ethtool support it should use
ethtool_ops.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 76f2b4d9

arch/xtensa/platform-iss/network.c

+0 −33
Original line number Diff line number Diff line
@@ -611,38 +611,6 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu) 
	return -EINVAL;

}



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

{

#if 0

	static const struct ethtool_drvinfo info = {

		.cmd     = ETHTOOL_GDRVINFO,

		.driver  = DRIVER_NAME,

		.version = "42",

	};

	void *useraddr;

	u32 ethcmd;



	switch (cmd) {

	case SIOCETHTOOL:

		useraddr = ifr->ifr_data;

		if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))

			return -EFAULT;



		switch (ethcmd) {

			case ETHTOOL_GDRVINFO:

				if (copy_to_user(useraddr, &info, sizeof(info)))

					return -EFAULT;

				return 0;

			default:

				return -EOPNOTSUPP;

		}

	default:

		return -EINVAL;

	}

#endif

	return -EINVAL;

}



void iss_net_user_timer_expire(unsigned long _conn)

{

}
@@ -730,7 +698,6 @@ static int iss_net_configure(int index, char *init) 
	dev->tx_timeout = iss_net_tx_timeout;

	dev->set_mac_address = iss_net_set_mac;

	dev->change_mtu = iss_net_change_mtu;

	dev->do_ioctl = iss_net_ioctl;

	dev->watchdog_timeo = (HZ >> 1);

	dev->irq = -1;