Module Name: src
Committed By: christos
Date: Mon Jan 19 15:07:25 UTC 2015
Modified Files:
src/sys/dev/pci: if_alc.c
Log Message:
CID 1245802: Result always 0.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_alc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.12 src/sys/dev/pci/if_alc.c:1.13
--- src/sys/dev/pci/if_alc.c:1.12 Sun Jan 18 10:30:03 2015
+++ src/sys/dev/pci/if_alc.c Mon Jan 19 10:07:25 2015
@@ -468,8 +468,9 @@ alc_dsp_fixup(struct alc_softc *sc, int
len = alc_miiext_readreg(sc, MII_EXT_PCS, MII_EXT_CLDCTL6);
len = (len >> EXT_CLDCTL6_CAB_LEN_SHIFT) &
EXT_CLDCTL6_CAB_LEN_MASK;
- agc = alc_miidbg_readreg(sc, MII_DBG_AGC);
- agc = (agc >> DBG_AGC_2_VGA_SHIFT) & DBG_AGC_2_VGA_MASK;
+ /* XXX: used to be (alc >> shift) & mask which is 0 */
+ agc = alc_miidbg_readreg(sc, MII_DBG_AGC) & DBG_AGC_2_VGA_MASK;
+ agc >>= DBG_AGC_2_VGA_SHIFT;
if ((media == IFM_1000_T && len > EXT_CLDCTL6_CAB_LEN_SHORT1G &&
agc > DBG_AGC_LONG1G_LIMT) ||
(media == IFM_100_TX && len > DBG_AGC_LONG100M_LIMT &&
