[patch] 2.5.41: mii breakage in xircom_tulip_cb

From: Stig Brautaset (stig@brautaset.org)
Date: Mon Oct 07 2002 - 17:07:53 EST


I use the xircom_tulip_cb driver with 2.4.19, because it is mii-enabled,
and the new driver isn't.

In 2.5.41 (and .40, at least) the mii-capabilities is not there, I have
not tested earlier development kernels. The changes between the driver
in 2.4.19 and 2.5.41 are miniscule, so I was able to make mii work
again (this is my first attempt at kernel hacking; don't laugh :). It's
most definately _not_ the correct fix, it is just a revert from 2.4.19
that makes mii work for me again in 2.5.

--- drivers/net/tulip/xircom_tulip_cb.c.orig Mon Oct 7 22:53:22 2002
+++ drivers/net/tulip/xircom_tulip_cb.c Mon Oct 7 22:31:45 2002
@@ -1469,18 +1469,21 @@
 
         /* Legacy mii-diag interface */
         case SIOCGMIIPHY: /* Get address of MII PHY in use. */
+ case SIOCDEVPRIVATE: /* for binary compat, remove in 2.5 */
                 if (tp->mii_cnt)
                         data[0] = phy;
                 else
                         return -ENODEV;
                 return 0;
         case SIOCGMIIREG: /* Read MII PHY register. */
+ case SIOCDEVPRIVATE+1: /* for binary compat, remove in 2.5 */
                 save_flags(flags);
                 cli();
                 data[3] = mdio_read(dev, data[0] & 0x1f, data[1] & 0x1f);
                 restore_flags(flags);
                 return 0;
         case SIOCSMIIREG: /* Write MII PHY register. */
+ case SIOCDEVPRIVATE+2: /* for binary compat, remove in 2.5 */
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
                 save_flags(flags);

Stig

-- 
brautaset.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:01:01 EST