diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-12 12:46:11 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-12 12:46:11 +0000 |
commit | df5a752772493b5a3e5efffb2cdef35c08225f41 (patch) | |
tree | 0b70325c3f2541afba5342cb4fcfd857ffb4f70a /usr/src/uts/common/io/mac/mac.c | |
parent | cd134fbefbadf1e3e1923a18a345d4813f39fea3 (diff) | |
parent | 3bc4925d580ab95c16f1ddd5eb387655cbd16e65 (diff) | |
download | illumos-joyent-df5a752772493b5a3e5efffb2cdef35c08225f41.tar.gz |
[illumos-gate merge]
commit 3bc4925d580ab95c16f1ddd5eb387655cbd16e65
6329 Need support for new link speeds in mac_ether
6330 Delete ETHER_STAT_ISMII macro
Diffstat (limited to 'usr/src/uts/common/io/mac/mac.c')
-rw-r--r-- | usr/src/uts/common/io/mac/mac.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/mac/mac.c b/usr/src/uts/common/io/mac/mac.c index c46566f012..1bf49a5b44 100644 --- a/usr/src/uts/common/io/mac/mac.c +++ b/usr/src/uts/common/io/mac/mac.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015 Joyent, Inc. + * Copyright 2015 Garrett D'Amore <garrett@damore.org> */ /* @@ -3035,6 +3036,14 @@ mac_prop_check_size(mac_prop_id_t id, uint_t valsize, boolean_t is_range) case MAC_PROP_FLOWCTRL: minsize = sizeof (link_flowctrl_t); break; + case MAC_PROP_ADV_5000FDX_CAP: + case MAC_PROP_EN_5000FDX_CAP: + case MAC_PROP_ADV_2500FDX_CAP: + case MAC_PROP_EN_2500FDX_CAP: + case MAC_PROP_ADV_100GFDX_CAP: + case MAC_PROP_EN_100GFDX_CAP: + case MAC_PROP_ADV_40GFDX_CAP: + case MAC_PROP_EN_40GFDX_CAP: case MAC_PROP_ADV_10GFDX_CAP: case MAC_PROP_EN_10GFDX_CAP: case MAC_PROP_ADV_1000HDX_CAP: |