patch-2.4.23 linux-2.4.23/drivers/net/pcmcia/pcnet_cs.c
Next file: linux-2.4.23/drivers/net/pcmcia/ray_cs.c
Previous file: linux-2.4.23/drivers/net/pcmcia/nmclan_cs.c
Back to the patch index
Back to the overall index
- Lines: 96
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/pcmcia/pcnet_cs.c
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.22/drivers/net/pcmcia/pcnet_cs.c linux-2.4.23/drivers/net/pcmcia/pcnet_cs.c
@@ -117,7 +117,9 @@
static int pcnet_open(struct net_device *dev);
static int pcnet_close(struct net_device *dev);
static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static int do_ioctl_light(struct net_device *dev, struct ifreq *rq, int cmd);
+
+static struct ethtool_ops netdev_ethtool_ops;
+
static void ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs);
static void ei_watchdog(u_long arg);
static void pcnet_reset_8390(struct net_device *dev);
@@ -765,6 +767,7 @@
strcpy(info->node.dev_name, dev->name);
link->dev = &info->node;
+ SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
if (info->flags & (IS_DL10019|IS_DL10022)) {
u_char id = inb(dev->base_addr + 0x1a);
@@ -778,7 +781,6 @@
printk("PNA, ");
} else {
printk(KERN_INFO "%s: NE2000 Compatible: ", dev->name);
- dev->do_ioctl = &do_ioctl_light;
}
printk("io %#3lx, irq %d,", dev->base_addr, dev->irq);
if (info->flags & USE_SHMEM)
@@ -1215,26 +1217,16 @@
/*====================================================================*/
-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;
-
- if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd)))
- return -EFAULT;
-
- switch (ethcmd) {
- case ETHTOOL_GDRVINFO: {
- struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
- strncpy(info.driver, "pcnet_cs", sizeof(info.driver)-1);
- if (copy_to_user(useraddr, &info, sizeof(info)))
- return -EFAULT;
- return 0;
- }
- }
-
- return -EOPNOTSUPP;
+ strcpy(info->driver, "pcnet_cs");
}
+static struct ethtool_ops netdev_ethtool_ops = {
+ .get_drvinfo = netdev_get_drvinfo,
+};
+
/*====================================================================*/
@@ -1244,13 +1236,14 @@
u16 *data = (u16 *)&rq->ifr_data;
ioaddr_t mii_addr = dev->base_addr + DLINK_GPIO;
switch (cmd) {
- case SIOCETHTOOL:
- return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
+ case SIOCGMIIPHY:
case SIOCDEVPRIVATE:
data[0] = info->phy_id;
+ case SIOCGMIIREG: /* Read MII PHY register. */
case SIOCDEVPRIVATE+1:
data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f);
return 0;
+ case SIOCSMIIREG: /* Write MII PHY register. */
case SIOCDEVPRIVATE+2:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
@@ -1262,17 +1255,6 @@
/*====================================================================*/
-static int do_ioctl_light(struct net_device *dev, struct ifreq *rq, int cmd)
-{
- switch (cmd) {
- case SIOCETHTOOL:
- return netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
- }
- return -EOPNOTSUPP;
-}
-
-/*====================================================================*/
-
static void dma_get_8390_hdr(struct net_device *dev,
struct e8390_pkt_hdr *hdr,
int ring_page)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)