Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

r256827:

  Correct MAC revision bits. Previously it always cleared bit 20 and
  bit 21.
Approved by:	re (delphij)
  • Loading branch information...
commit 50abdc63fc75ec902f990c6bde7d03aa9ab25172 1 parent 8d04fd7
yongari authored
Showing with 4 additions and 2 deletions.
  1. +3 −2 sys/dev/re/if_re.c
  2. +1 −0  sys/pci/if_rlreg.h
View
5 sys/dev/re/if_re.c
@@ -1367,10 +1367,11 @@ re_attach(device_t dev)
break;
default:
device_printf(dev, "Chip rev. 0x%08x\n", hwrev & 0x7c800000);
+ sc->rl_macrev = hwrev & 0x00700000;
hwrev &= RL_TXCFG_HWREV;
break;
}
- device_printf(dev, "MAC rev. 0x%08x\n", hwrev & 0x00700000);
+ device_printf(dev, "MAC rev. 0x%08x\n", sc->rl_macrev);
while (hw_rev->rl_desc != NULL) {
if (hw_rev->rl_rev == hwrev) {
sc->rl_type = hw_rev->rl_type;
@@ -1429,7 +1430,7 @@ re_attach(device_t dev)
sc->rl_flags |= RL_FLAG_MACSLEEP;
/* FALLTHROUGH */
case RL_HWREV_8168C:
- if ((hwrev & 0x00700000) == 0x00200000)
+ if (sc->rl_macrev == 0x00200000)
sc->rl_flags |= RL_FLAG_MACSLEEP;
/* FALLTHROUGH */
case RL_HWREV_8168CP:
View
1  sys/pci/if_rlreg.h
@@ -877,6 +877,7 @@ struct rl_softc {
bus_dma_tag_t rl_parent_tag;
uint8_t rl_type;
const struct rl_hwrev *rl_hwrev;
+ uint32_t rl_macrev;
int rl_eecmd_read;
int rl_eewidth;
int rl_expcap;
Please sign in to comment.
Something went wrong with that request. Please try again.