diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2012-07-29 23:39:59 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2012-07-29 23:36:42 -0400 |
| commit | 536df542129698c6bedf6f515d0d547d89268c55 (patch) | |
| tree | eb943071bdfcf9ce4187c4700f6204c280d0a731 /usr/src | |
| parent | fc77657032ede5eb53e6f919c14f48559e6e212e (diff) | |
| download | illumos-joyent-536df542129698c6bedf6f515d0d547d89268c55.tar.gz | |
3014 Intel X540 Support (fix SPARC build)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_82599.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_common.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_common.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ixgbe/ixgbe_osdep.h | 9 |
4 files changed, 7 insertions, 12 deletions
diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_82599.c b/usr/src/uts/common/io/ixgbe/ixgbe_82599.c index 15c59d4891..52f9237581 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_82599.c +++ b/usr/src/uts/common/io/ixgbe/ixgbe_82599.c @@ -1292,7 +1292,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl) */ #define IXGBE_ATR_COMMON_HASH_KEY \ (IXGBE_ATR_BUCKET_HASH_KEY & IXGBE_ATR_SIGNATURE_HASH_KEY) -#if lint +#ifdef lint #define IXGBE_COMPUTE_SIG_HASH_ITERATION(_n) #else #define IXGBE_COMPUTE_SIG_HASH_ITERATION(_n) \ @@ -1432,7 +1432,7 @@ s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw, return IXGBE_SUCCESS; } -#if lint +#ifdef lint #define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) #else #define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) \ diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_common.c b/usr/src/uts/common/io/ixgbe/ixgbe_common.c index bc0d4f6c69..8e735588a2 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_common.c +++ b/usr/src/uts/common/io/ixgbe/ixgbe_common.c @@ -3969,7 +3969,7 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* first pull in the header so we know the buffer length */ for (bi = 0; bi < dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS(&buffer[bi]); + buffer[bi] = IXGBE_LE32_TO_CPUS(buffer[bi]); } /* If there is any thing in data position pull it in */ @@ -3989,7 +3989,7 @@ static s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* Pull in the rest of the buffer (bi is where we left off)*/ for (; bi <= dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS(&buffer[bi]); + buffer[bi] = IXGBE_LE32_TO_CPUS(buffer[bi]); } out: diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_common.h b/usr/src/uts/common/io/ixgbe/ixgbe_common.h index 9cf7ab6f2a..e1d4854ab9 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_common.h +++ b/usr/src/uts/common/io/ixgbe/ixgbe_common.h @@ -36,7 +36,7 @@ #define _IXGBE_COMMON_H_ #include "ixgbe_type.h" -#if lint +#ifdef lint /* Use "hw" somehow... */ #define IXGBE_WRITE_REG64(hw, reg, value) hw = hw #else diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h b/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h index f3b7e23fb3..6be92a7d3b 100644 --- a/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h +++ b/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h @@ -107,16 +107,11 @@ void ixgbe_write_pci_cfg(struct ixgbe_hw *, uint32_t, uint32_t); #define IXGBE_NTOHS ntohs #ifdef _BIG_ENDIAN -#define IXGBE_CPU_TO_LE32 BSWAP_32 +#define IXGBE_CPU_TO_LE32 BSWAP_32 #define IXGBE_LE32_TO_CPUS BSWAP_32 #else #define IXGBE_CPU_TO_LE32(x) (x) -#if lint -/* Use lint-happy operation... */ -#define IXGBE_LE32_TO_CPUS(x) -#else -#define IXGBE_LE32_TO_CPUS(x) (x) -#endif /* lint */ +#define IXGBE_LE32_TO_CPUS(x) (x) #endif /* _BIG_ENDIAN */ #define UNREFERENCED_PARAMETER(x) _NOTE(ARGUNUSED(x)) |