[netdrvr pcmcia] support SIOC[GS]MII{PHY,REG} ioctls

Updated drivers;  3c574_cs, axnet_cs, pcnet_cs, xirc2ps_cs

Thanks to Komuro for pointing this out.

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 66c6bd556e86f0e20c98efce0bcf0f2734f45956..2b892fbd49ae957679c3aa379a4fa2674f65a046 100644 (file)
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -1227,9 +1227,9 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                  data[0], data[1], data[2], data[3]);
 
        switch(cmd) {
-       case SIOCDEVPRIVATE:            /* Get the address of the PHY in use. */
+       case SIOCGMIIPHY:               /* Get the address of the PHY in use. */
                data[0] = phy;
-       case SIOCDEVPRIVATE+1:          /* Read the specified MII register. */
+       case SIOCGMIIREG:               /* Read the specified MII register. */
                {
                        int saved_window;
                        unsigned long flags;
@@ -1242,7 +1242,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                        spin_unlock_irqrestore(&lp->window_lock, flags);
                        return 0;
                }
-       case SIOCDEVPRIVATE+2:          /* Write the specified MII register */
+       case SIOCSMIIREG:               /* Write the specified MII register */
                {
                        int saved_window;
                        unsigned long flags;

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 6ae50eb91f95e7942566f1672f6f97c076231b8f..104ddf6d39c2bab25d266f576771d3e39414f7d7 100644 (file)
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -827,12 +827,12 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
     u16 *data = (u16 *)&rq->ifr_data;
     ioaddr_t mii_addr = dev->base_addr + AXNET_MII_EEP;
     switch (cmd) {
-    case SIOCDEVPRIVATE:
+    case SIOCGMIIPHY:
        data[0] = info->phy_id;
-    case SIOCDEVPRIVATE+1:
+    case SIOCGMIIREG:          /* Read MII PHY register. */
        data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f);
        return 0;
-    case SIOCDEVPRIVATE+2:
+    case SIOCSMIIREG:          /* Write MII PHY register. */
        if (!capable(CAP_NET_ADMIN))
            return -EPERM;
        mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]);

diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 62b98439546dc20eceb5ca3c2a594a0c7df2e436..c29b74b578d0640ec0ddd4da88fc37992d08f27b 100644 (file)
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1224,12 +1224,12 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
     u16 *data = (u16 *)&rq->ifr_data;
     ioaddr_t mii_addr = dev->base_addr + DLINK_GPIO;
     switch (cmd) {
-    case SIOCDEVPRIVATE:
+    case SIOCGMIIPHY:
        data[0] = info->phy_id;
-    case SIOCDEVPRIVATE+1:
+    case SIOCGMIIREG:          /* Read MII PHY register. */
        data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f);
        return 0;
-    case SIOCDEVPRIVATE+2:
+    case SIOCSMIIREG:          /* Write MII PHY register. */
        if (!capable(CAP_NET_ADMIN))
            return -EPERM;
        mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]);

diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 4e4dfdd592f8d1121f4f4ca41520264267eca378..e2824c4b26b21005633d6b181784fddf24ce063e 100644 (file)
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1726,13 +1726,13 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        return -EOPNOTSUPP;
 
     switch(cmd) {
-      case SIOCDEVPRIVATE:     /* Get the address of the PHY in use. */
+      case SIOCGMIIPHY:                /* Get the address of the PHY in use. */
        data[0] = 0;            /* we have only this address */
        /* fall trough */
-      case SIOCDEVPRIVATE+1:   /* Read the specified MII register. */
+      case SIOCGMIIREG:                /* Read the specified MII register. */
        data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
        break;
-      case SIOCDEVPRIVATE+2:   /* Write the specified MII register */
+      case SIOCSMIIREG:                /* Write the specified MII register */
        if (!capable(CAP_NET_ADMIN))
            return -EPERM;
        mii_wr(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2], 16);