> Date: Sun, 19 Jun 2011 12:52:43 +0100 > From: Stuart Henderson <s...@spacehopper.org> > > some different versions of MII devices print identical strings > when they attach, this diff makes them unique. ok?
I think this is ugly. Unless there is a pressing need to distinguish these in dmesg, I'd urge you not to do this. > Index: miidevs > =================================================================== > RCS file: /cvs/src/sys/dev/mii/miidevs,v > retrieving revision 1.116 > diff -u -p -r1.116 miidevs > --- miidevs 21 Jan 2011 09:46:13 -0000 1.116 > +++ miidevs 19 Jun 2011 11:48:47 -0000 > @@ -118,9 +118,9 @@ model AMD 79C873phy 0x0036 Am79C873 int > model AGERE ET1011 0x0004 ET1011 10/100/1000baseT PHY > > /* Atheros PHYs */ > -model ATHEROS F1 0x0001 F1 10/100/1000 PHY > +model ATHEROS F1 0x0001 F1 1 10/100/1000 PHY > model ATHEROS F2 0x0002 F2 10/100 PHY > -model ATHEROS F1_7 0x0007 F1 10/100/1000 PHY > +model ATHEROS F1_7 0x0007 F1 2 10/100/1000 PHY > > /* Altima PHYs */ > model xxALTIMA AC_UNKNOWN 0x0001 AC_UNKNOWN 10/100 PHY > @@ -177,8 +177,8 @@ model xxCICADA CS8201B 0x0021 CS8201 10 > model CICADA CS8201 0x0001 CS8201 10/100/1000TX PHY > model CICADA CS8204 0x0004 CS8204 10/100/1000TX PHY > model CICADA VSC8211 0x000b VSC8211 10/100/1000 PHY > -model CICADA CS8201A 0x0020 CS8201 10/100/1000TX PHY > -model CICADA CS8201B 0x0021 CS8201 10/100/1000TX PHY > +model CICADA CS8201A 0x0020 CS8201A 10/100/1000TX PHY > +model CICADA CS8201B 0x0021 CS8201B 10/100/1000TX PHY > model CICADA CS8244 0x002c CS8244 10/100/1000TX PHY > > /* Davicom PHYs */ > @@ -299,8 +299,8 @@ model TDK 78Q2120 0x0014 78Q2120 10/100 > model TDK 78Q2121 0x0015 78Q2121 100baseTX PHY > > /* VIA Networking PHYs */ > -model VIA VT6103 0x0032 VT6103 10/100 PHY > -model VIA VT6103_2 0x0034 VT6103 10/100 PHY > +model VIA VT6103 0x0032 VT6103 1 10/100 PHY > +model VIA VT6103_2 0x0034 VT6103 2 10/100 PHY > > /* Vitesse PHYs */ > model VITESSE VSC8601 0x0002 VSC8601 10/100/1000 PHY