patch-2.4.23 linux-2.4.23/drivers/net/pcmcia/3c589_cs.c
Next file: linux-2.4.23/drivers/net/pcmcia/aironet4500_cs.c
Previous file: linux-2.4.23/drivers/net/pcmcia/3c574_cs.c
Back to the patch index
Back to the overall index
- Lines: 109
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/pcmcia/3c589_cs.c
- Orig date:
2002-02-25 11:37:59.000000000 -0800
diff -urN linux-2.4.22/drivers/net/pcmcia/3c589_cs.c linux-2.4.23/drivers/net/pcmcia/3c589_cs.c
@@ -165,7 +165,7 @@
static int el3_close(struct net_device *dev);
static void el3_tx_timeout(struct net_device *dev);
static void set_multicast_list(struct net_device *dev);
-static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
+static struct ethtool_ops netdev_ethtool_ops;
static dev_info_t dev_info = "3c589_cs";
@@ -256,7 +256,7 @@
dev->tx_timeout = el3_tx_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
#endif
- dev->do_ioctl = netdev_ioctl;
+ SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
/* Register with Card Services */
link->next = dev_list;
@@ -648,70 +648,33 @@
| AdapterFailure, ioaddr + EL3_CMD);
}
-static int netdev_ethtool_ioctl (struct net_device *dev, void *useraddr)
+static void netdev_get_drvinfo(struct net_device *dev,
+ struct ethtool_drvinfo *info)
{
- u32 ethcmd;
-
- /* dev_ioctl() in ../../net/core/dev.c has already checked
- capable(CAP_NET_ADMIN), so don't bother with that here. */
-
- if (get_user(ethcmd, (u32 *)useraddr))
- return -EFAULT;
-
- switch (ethcmd) {
-
- case ETHTOOL_GDRVINFO: {
- struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
- strcpy (info.driver, DRV_NAME);
- strcpy (info.version, DRV_VERSION);
- sprintf(info.bus_info, "PCMCIA 0x%lx", dev->base_addr);
- if (copy_to_user (useraddr, &info, sizeof (info)))
- return -EFAULT;
- return 0;
- }
+ strcpy(info->driver, DRV_NAME);
+ strcpy(info->version, DRV_VERSION);
+ sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
+}
#ifdef PCMCIA_DEBUG
- /* get message-level */
- case ETHTOOL_GMSGLVL: {
- struct ethtool_value edata = {ETHTOOL_GMSGLVL};
- edata.data = pc_debug;
- if (copy_to_user(useraddr, &edata, sizeof(edata)))
- return -EFAULT;
- return 0;
- }
- /* set message-level */
- case ETHTOOL_SMSGLVL: {
- struct ethtool_value edata;
- if (copy_from_user(&edata, useraddr, sizeof(edata)))
- return -EFAULT;
- pc_debug = edata.data;
- return 0;
- }
-#endif
-
- default:
- break;
- }
-
- return -EOPNOTSUPP;
+static u32 netdev_get_msglevel(struct net_device *dev)
+{
+ return pc_debug;
}
-static int netdev_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
+static void netdev_set_msglevel(struct net_device *dev, u32 level)
{
- int rc;
-
- switch (cmd) {
- case SIOCETHTOOL:
- rc = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
- break;
-
- default:
- rc = -EOPNOTSUPP;
- break;
- }
-
- return rc;
+ pc_debug = level;
}
+#endif /* PCMCIA_DEBUG */
+
+static struct ethtool_ops netdev_ethtool_ops = {
+ .get_drvinfo = netdev_get_drvinfo,
+#ifdef PCMCIA_DEBUG
+ .get_msglevel = netdev_get_msglevel,
+ .set_msglevel = netdev_set_msglevel,
+#endif /* PCMCIA_DEBUG */
+};
static int el3_config(struct net_device *dev, struct ifmap *map)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)