diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
| commit | 5118afa75776a41209a94f4a4ddf7c3164fac0df (patch) | |
| tree | a899f605d0f0d9be1fb44d7a8d643a1233065dda /sys/dev/sfxge/common/efx_types.h | |
| parent | 58b7eab7d39d983cc70f6f1d611f00470a76fca1 (diff) | |
| parent | ce58d6dbf38815b68dedcf0559779e5ceb149a0d (diff) | |
| download | FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.zip FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/sfxge/common/efx_types.h')
| -rw-r--r-- | sys/dev/sfxge/common/efx_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sfxge/common/efx_types.h b/sys/dev/sfxge/common/efx_types.h index ee357b1..ae4c6d9 100644 --- a/sys/dev/sfxge/common/efx_types.h +++ b/sys/dev/sfxge/common/efx_types.h @@ -536,7 +536,7 @@ extern int fix_lint; (_oword).eo_u32[3]) == ~((uint32_t)0)) #define EFX_QWORD_IS_SET64(_qword) \ - (((_qword).eq_u64[0]) == ~((uint32_t)0)) + (((_qword).eq_u64[0]) == ~((uint64_t)0)) #define EFX_QWORD_IS_SET32(_qword) \ (((_qword).eq_u32[0] & \ @@ -1584,7 +1584,7 @@ extern int fix_lint; #define EFX_OR_BYTE(_byte1, _byte2) \ do { \ - (_byte1).eb_u8[0] &= (_byte2).eb_u8[0]; \ + (_byte1).eb_u8[0] |= (_byte2).eb_u8[0]; \ _NOTE(CONSTANTCONDITION) \ } while (B_FALSE) |
