Mercurial > illumos > illumos-gate
changeset 13763:0a4839ba58c3
3014 Intel X540 Support (fix SPARC build)
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Sun, 29 Jul 2012 23:39:59 +0100 |
| parents | e0e5ba2d65b6 |
| children | 38b4aca480b3 |
| files | usr/src/uts/common/io/ixgbe/ixgbe_82599.c usr/src/uts/common/io/ixgbe/ixgbe_common.c usr/src/uts/common/io/ixgbe/ixgbe_common.h usr/src/uts/common/io/ixgbe/ixgbe_osdep.h |
| diffstat | 4 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/ixgbe/ixgbe_82599.c Fri Jul 27 22:26:21 2012 -0400 +++ b/usr/src/uts/common/io/ixgbe/ixgbe_82599.c Sun Jul 29 23:39:59 2012 +0100 @@ -1292,7 +1292,7 @@ */ #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 @@ return IXGBE_SUCCESS; } -#if lint +#ifdef lint #define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) #else #define IXGBE_COMPUTE_BKT_HASH_ITERATION(_n) \
--- a/usr/src/uts/common/io/ixgbe/ixgbe_common.c Fri Jul 27 22:26:21 2012 -0400 +++ b/usr/src/uts/common/io/ixgbe/ixgbe_common.c Sun Jul 29 23:39:59 2012 +0100 @@ -3969,7 +3969,7 @@ /* 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 @@ /* 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:
--- a/usr/src/uts/common/io/ixgbe/ixgbe_common.h Fri Jul 27 22:26:21 2012 -0400 +++ b/usr/src/uts/common/io/ixgbe/ixgbe_common.h Sun Jul 29 23:39:59 2012 +0100 @@ -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
--- a/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h Fri Jul 27 22:26:21 2012 -0400 +++ b/usr/src/uts/common/io/ixgbe/ixgbe_osdep.h Sun Jul 29 23:39:59 2012 +0100 @@ -107,16 +107,11 @@ #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))