cvs commit: src/sys/dev/netif/mii_layer brgphy.c src/sys/dev/netif/bge if_bge.c if_bgereg.h
Sepherosa Ziehau
sephe at crater.dragonflybsd.org
Wed May 2 07:35:55 PDT 2007
sephe 2007/05/02 07:34:10 PDT
DragonFly src repository
Modified files:
sys/dev/netif/mii_layer brgphy.c
sys/dev/netif/bge if_bge.c if_bgereg.h
Log:
- Merge following link state detection fixes from FreeBSD:
if_bge.c rev 1.{102, 104, 113, 120, 124} (mainly oleg at freebsd.org)
Local modifications:
o Split bge_link_upd() into
bge_bcm5700_link_upd() -- for 5700 chips, except B2
bge_tbi_link_upd() -- for fiber interface
bge_copper_link_upd() -- for the rest for the bge(4) chips
Assign one of them to bge_softc.bge_link_upd based on chip type
in attach routine.
o Add bge_softc.bge_link_chg, which is setup based on chip type in
attach routine. It is used to check against MAC_STS to determine
whether link state is changed or not.
o We always trust that "link state changed" bit in MAC_STS is correct.
o Keep the PCS error checks for fiber interface during link state
changing detection.
- After above change, bge_tick() is used to drive mii_tick(), so cleanup
brgphy_mii_phy_auto().
- In brgphy_status(), use temporary variable to hold BRGPHY_MII_AUXSTS,
so it is not accessed twice.
- For fiber interface, correct media status reporting if link is down.
Obtained-from: OpenBSD (brad at openbsd.org)
- Correct chip id for 5700 B1 and 5700 B2.
- Minor style changes.
Revision Changes Path
1.16 +27 -64 src/sys/dev/netif/mii_layer/brgphy.c
1.73 +202 -129 src/sys/dev/netif/bge/if_bge.c
1.20 +6 -2 src/sys/dev/netif/bge/if_bgereg.h
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/brgphy.c.diff?r1=1.15&r2=1.16&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bge/if_bge.c.diff?r1=1.72&r2=1.73&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/bge/if_bgereg.h.diff?r1=1.19&r2=1.20&f=u
More information about the Commits
mailing list