diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-29 11:57:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-29 11:57:14 +0000 |
| commit | 83ee1a48d5d7b2202108e82934ecc0acca417c1a (patch) | |
| tree | 0bae49340f46c8159106ac5e49370265933bc44e | |
| parent | 251db2e8b9ec07ea90338af7f57bb91a74e2a8a2 (diff) | |
| parent | e7ad7ed17e1019f9c51dd4b451481a77f024ced3 (diff) | |
| download | illumos-joyent-83ee1a48d5d7b2202108e82934ecc0acca417c1a.tar.gz | |
[illumos-gate merge]
commit e7ad7ed17e1019f9c51dd4b451481a77f024ced3
6064 ixgbe needs X550 support (fix Studio build)
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/core/ixgbe_type.h | 6 | ||||
| -rw-r--r-- | usr/src/uts/intel/ixgbe/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ixgbe/Makefile | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/ixgbe/core/ixgbe_type.h b/usr/src/uts/common/io/ixgbe/core/ixgbe_type.h index 123c9d5210..45e8a7d029 100644 --- a/usr/src/uts/common/io/ixgbe/core/ixgbe_type.h +++ b/usr/src/uts/common/io/ixgbe/core/ixgbe_type.h @@ -3974,7 +3974,7 @@ struct ixgbe_hw { #define IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX (1 << 24) #define IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR (1 << 26) #define IXGBE_KRM_LINK_CTRL_1_TETH_AN_ENABLE (1 << 29) -#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART (1 << 31) +#define IXGBE_KRM_LINK_CTRL_1_TETH_AN_RESTART (1UL << 31) #define IXGBE_KRM_AN_CNTL_1_SYM_PAUSE (1 << 28) #define IXGBE_KRM_AN_CNTL_1_ASM_PAUSE (1 << 29) @@ -3991,7 +3991,7 @@ struct ixgbe_hw { #define IXGBE_KRM_TX_COEFF_CTRL_1_CMINUS1_OVRRD_EN (1 << 1) #define IXGBE_KRM_TX_COEFF_CTRL_1_CPLUS1_OVRRD_EN (1 << 2) #define IXGBE_KRM_TX_COEFF_CTRL_1_CZERO_EN (1 << 3) -#define IXGBE_KRM_TX_COEFF_CTRL_1_OVRRD_EN (1 << 31) +#define IXGBE_KRM_TX_COEFF_CTRL_1_OVRRD_EN (1UL << 31) #define IXGBE_SB_IOSF_INDIRECT_CTRL 0x00011144 #define IXGBE_SB_IOSF_INDIRECT_DATA 0x00011148 @@ -4007,7 +4007,7 @@ struct ixgbe_hw { #define IXGBE_SB_IOSF_CTRL_TARGET_SELECT_SHIFT 28 #define IXGBE_SB_IOSF_CTRL_TARGET_SELECT_MASK 0x7 #define IXGBE_SB_IOSF_CTRL_BUSY_SHIFT 31 -#define IXGBE_SB_IOSF_CTRL_BUSY (1 << IXGBE_SB_IOSF_CTRL_BUSY_SHIFT) +#define IXGBE_SB_IOSF_CTRL_BUSY (1UL << IXGBE_SB_IOSF_CTRL_BUSY_SHIFT) #define IXGBE_SB_IOSF_TARGET_KR_PHY 0 #define IXGBE_NW_MNG_IF_SEL 0x00011178 diff --git a/usr/src/uts/intel/ixgbe/Makefile b/usr/src/uts/intel/ixgbe/Makefile index 31a1bcda4d..26d0e670f2 100644 --- a/usr/src/uts/intel/ixgbe/Makefile +++ b/usr/src/uts/intel/ixgbe/Makefile @@ -58,6 +58,7 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-value +CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED # # Define targets diff --git a/usr/src/uts/sparc/ixgbe/Makefile b/usr/src/uts/sparc/ixgbe/Makefile index 3e5e4336e8..90fbc215c8 100644 --- a/usr/src/uts/sparc/ixgbe/Makefile +++ b/usr/src/uts/sparc/ixgbe/Makefile @@ -58,6 +58,7 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-switch CERRWARN += -_gcc=-Wno-uninitialized CERRWARN += -_gcc=-Wno-unused-value +CERRWARN += -_cc=-erroff=E_STATEMENT_NOT_REACHED # # Define targets |