diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
| commit | de1c7a865adeab38b51e5c0db5058e61469b322c (patch) | |
| tree | 898a230006c801195b396aa68892d1296d8c549e /usr/src/uts/common/sys | |
| parent | 69ac6c001ab11b88fdfc6b13fcc344154a268056 (diff) | |
| parent | 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a (diff) | |
| download | illumos-joyent-de1c7a865adeab38b51e5c0db5058e61469b322c.tar.gz | |
[illumos-gate merge]
commit 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a
13083 Enable gate builds with OpenJDK 11
commit fd147c98dbdbc9e5ac99fa51cb608e8eeb1f16f1
13168 reality should reflect the mac_prop_id_t comment
commit 3626423cd8fd36c60b866e625aff599f055c7dc3
13167 Update hwdata to 2020.9.15
Conflicts:
usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/mac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h index a5974f6d7d..bd668cdb6b 100644 --- a/usr/src/uts/common/sys/mac.h +++ b/usr/src/uts/common/sys/mac.h @@ -171,6 +171,7 @@ typedef enum { * Please append properties to the end of this list. Do not reorder the list. */ typedef enum { + MAC_PROP_PRIVATE = -1, MAC_PROP_DUPLEX = 0x00000001, MAC_PROP_SPEED, MAC_PROP_STATUS, @@ -248,8 +249,7 @@ typedef enum { MAC_PROP_ADV_50GFDX_CAP, MAC_PROP_EN_50GFDX_CAP, MAC_PROP_EN_FEC_CAP, - MAC_PROP_ADV_FEC_CAP, - MAC_PROP_PRIVATE = -1 + MAC_PROP_ADV_FEC_CAP } mac_prop_id_t; /* |