patch-2.4.21 linux-2.4.21/drivers/net/mii.c
Next file: linux-2.4.21/drivers/net/ni5010.c
Previous file: linux-2.4.21/drivers/net/macmace.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
2003-06-13 07:51:35.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/mii.c
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.20/drivers/net/mii.c linux-2.4.21/drivers/net/mii.c
@@ -2,7 +2,7 @@
mii.c: MII interface library
- Maintained by Jeff Garzik <jgarzik@mandrakesoft.com>
+ Maintained by Jeff Garzik <jgarzik@pobox.com>
Copyright 2001,2002 Jeff Garzik
Various code came from myson803.c and other files by
@@ -124,13 +124,13 @@
/* advertise only what has been requested */
advert = mii->mdio_read(dev, mii->phy_id, MII_ADVERTISE);
tmp = advert & ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
- if (ADVERTISED_10baseT_Half)
+ if (ecmd->advertising & ADVERTISED_10baseT_Half)
tmp |= ADVERTISE_10HALF;
- if (ADVERTISED_10baseT_Full)
+ if (ecmd->advertising & ADVERTISED_10baseT_Full)
tmp |= ADVERTISE_10FULL;
- if (ADVERTISED_100baseT_Half)
+ if (ecmd->advertising & ADVERTISED_100baseT_Half)
tmp |= ADVERTISE_100HALF;
- if (ADVERTISED_100baseT_Full)
+ if (ecmd->advertising & ADVERTISED_100baseT_Full)
tmp |= ADVERTISE_100FULL;
if (advert != tmp) {
mii->mdio_write(dev, mii->phy_id, MII_ADVERTISE, tmp);
@@ -339,7 +339,7 @@
return rc;
}
-MODULE_AUTHOR ("Jeff Garzik <jgarzik@mandrakesoft.com>");
+MODULE_AUTHOR ("Jeff Garzik <jgarzik@pobox.com>");
MODULE_DESCRIPTION ("MII hardware support library");
MODULE_LICENSE("GPL");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)