system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 16:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

r119712 introduced SIS_TYPE_83816 but it was not actually set in

Browse source 
driver such that checking against the type was always false.
To detect NS DP83816, driver should have checked silicon revision
register for NS controllers. While here, remove SIS_TYPE_83816 to
not make the similar mistake again.

Reported by:	Brad Smith ( brad@openbsd )
This commit is contained in:
Pyun YongHyeon 2013-03-18 04:46:17 +00:00
parent 1ab002f461
commit e8bedbd24a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=248456
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/sis/if_sis.c
View file

@ -625,7 +625,7 @@ sis_miibus_statchg(device_t dev)
SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS);
}
if (sc->sis_type == SIS_TYPE_83816) {
if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr >= NS_SRR_16A) {
/*
* MPII03.D: Half Duplex Excessive Collisions.
* Also page 49 in 83816 manual
@ -1989,7 +1989,7 @@ sis_initl(struct sis_softc *sc)
return;
}
if (sc->sis_type == SIS_TYPE_83815 || sc->sis_type == SIS_TYPE_83816) {
if (sc->sis_type == SIS_TYPE_83815) {
if (sc->sis_manual_pad != 0)
sc->sis_flags |= SIS_FLAG_MANUAL_PAD;
else

1
sys/dev/sis/if_sisreg.h
View file

@ -439,7 +439,6 @@ struct sis_type {
#define SIS_TYPE_900 1
#define SIS_TYPE_7016 2
#define SIS_TYPE_83815 3
#define SIS_TYPE_83816 4
struct sis_txdesc {
struct mbuf *tx_m;