patch-2.4.23 linux-2.4.23/drivers/net/pcmcia/wavelan_cs.c
Next file: linux-2.4.23/drivers/net/pcmcia/xirc2ps_cs.c
Previous file: linux-2.4.23/drivers/net/pcmcia/ray_cs.c
Back to the patch index
Back to the overall index
- Lines: 54
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/pcmcia/wavelan_cs.c
- Orig date:
2003-06-13 07:51:35.000000000 -0700
diff -urN linux-2.4.22/drivers/net/pcmcia/wavelan_cs.c linux-2.4.23/drivers/net/pcmcia/wavelan_cs.c
@@ -1890,27 +1890,17 @@
}
#endif /* HISTOGRAM */
-static inline int
-wl_netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
+
+static void netdev_get_drvinfo(struct net_device *dev,
+ struct ethtool_drvinfo *info)
{
- u32 ethcmd;
-
- if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd)))
- return -EFAULT;
-
- switch (ethcmd) {
- case ETHTOOL_GDRVINFO: {
- struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strncpy(info.driver, "wavelan_cs", sizeof(info.driver)-1);
- if (copy_to_user(useraddr, &info, sizeof(info)))
- return -EFAULT;
- return 0;
- }
- }
-
- return -EOPNOTSUPP;
+ strcpy(info->driver, "wavelan_cs");
}
+static struct ethtool_ops netdev_ethtool_ops = {
+ .get_drvinfo = netdev_get_drvinfo,
+};
+
/*------------------------------------------------------------------*/
/*
* Perform ioctl : config & info stuff
@@ -1933,9 +1923,6 @@
printk(KERN_DEBUG "%s: ->wavelan_ioctl(cmd=0x%X)\n", dev->name, cmd);
#endif
- if (cmd == SIOCETHTOOL)
- return wl_netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
-
/* Disable interrupts & save flags */
wv_splhi(lp, &flags);
@@ -4568,6 +4555,7 @@
dev->do_ioctl = wavelan_ioctl; /* wireless extensions */
dev->get_wireless_stats = wavelan_get_wireless_stats;
#endif
+ SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
/* Other specific data */
dev->mtu = WAVELAN_MTU;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)