diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-05-03 03:41:25 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2016-05-03 03:41:25 +0000 |
| commit | 453130d9bfc1c6d68b366dfcb041689d69f81295 (patch) | |
| tree | fe36ef227324b313676d43aef9a4d97c9a09675a /sys/dev/msk | |
| parent | 7860c0c3843dbb1cf8f4f2c20ee526e8dd2661da (diff) | |
Notes
Diffstat (limited to 'sys/dev/msk')
| -rw-r--r-- | sys/dev/msk/if_msk.c | 2 | ||||
| -rw-r--r-- | sys/dev/msk/if_mskreg.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index ffbe36eb423a..458d7fdeb43c 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -3493,7 +3493,7 @@ msk_intr_hwerr(struct msk_softc *sc) CSR_WRITE_1(sc, GMAC_TI_ST_CTRL, GMT_ST_CLR_IRQ); if ((status & Y2_IS_PCI_NEXP) != 0) { /* - * PCI Express Error occured which is not described in PEX + * PCI Express Error occurred which is not described in PEX * spec. * This error is also mapped either to Master Abort( * Y2_IS_MST_ERR) or Target Abort (Y2_IS_IRQ_STAT) bit and diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h index da69f2e8eb58..8f2ea634b50d 100644 --- a/sys/dev/msk/if_mskreg.h +++ b/sys/dev/msk/if_mskreg.h @@ -1309,7 +1309,7 @@ #define PHY_ST_EXT_ST (1<<8) /* Bit 8: Extended Status Present */ #define PHY_ST_PRE_SUP (1<<6) /* Bit 6: Preamble Suppression */ #define PHY_ST_AN_OVER (1<<5) /* Bit 5: Auto-Negotiation Over */ -#define PHY_ST_REM_FLT (1<<4) /* Bit 4: Remote Fault Condition Occured */ +#define PHY_ST_REM_FLT (1<<4) /* Bit 4: Remote Fault Condition Occurred */ #define PHY_ST_AN_CAP (1<<3) /* Bit 3: Auto-Negotiation Capability */ #define PHY_ST_LSYNC (1<<2) /* Bit 2: Link Synchronized */ #define PHY_ST_JAB_DET (1<<1) /* Bit 1: Jabber Detected */ @@ -1813,8 +1813,8 @@ #define GM_GPSR_LINK_UP BIT_12 /* Link Up Status */ #define GM_GPSR_PAUSE BIT_11 /* Pause State */ #define GM_GPSR_TX_ACTIVE BIT_10 /* Tx in Progress */ -#define GM_GPSR_EXC_COL BIT_9 /* Excessive Collisions Occured */ -#define GM_GPSR_LAT_COL BIT_8 /* Late Collisions Occured */ +#define GM_GPSR_EXC_COL BIT_9 /* Excessive Collisions Occurred */ +#define GM_GPSR_LAT_COL BIT_8 /* Late Collisions Occurred */ #define GM_GPSR_PHY_ST_CH BIT_5 /* PHY Status Change */ #define GM_GPSR_GIG_SPEED BIT_4 /* Gigabit Speed (1 = 1000 Mbps) */ #define GM_GPSR_PART_MODE BIT_3 /* Partition mode */ |