From: Christoph Hellwig <hch@lst.de>
To: jgarzik@pobox.com, chris@zankel.net
Cc: netdev@oss.sgi.com
Subject: [PATCH] xtensa platform-iss network: remove no-op ioctl handler
Date: Mon, 7 Nov 2005 06:20:36 +0100 [thread overview]
Message-ID: <20051107052036.GB17808@lst.de> (raw)
If the driver ever wants to add ethtool support it should use
ethtool_ops.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/arch/xtensa/platform-iss/network.c
===================================================================
--- linux-2.6.orig/arch/xtensa/platform-iss/network.c 2005-10-31 13:15:49.000000000 +0100
+++ linux-2.6/arch/xtensa/platform-iss/network.c 2005-11-04 15:17:16.000000000 +0100
@@ -611,38 +611,6 @@
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(ðcmd, 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 @@
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;
reply other threads:[~2005-11-07 5:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051107052036.GB17808@lst.de \
--to=hch@lst.de \
--cc=chris@zankel.net \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).