--- ../include/iscsiutil.h	2007-11-12 15:25:40.000000000 -0800
+++ ../include/iscsiutil.h	2008-04-18 21:31:18.000000000 -0700
@@ -77,16 +77,20 @@
 #define ISCSI_HTONLL6(x) (uint64_t) \
       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) >> 40))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) >> 24))     \
+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) >> 16))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) >> 8))      \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) << 8))      \
+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) << 16))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) << 24))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) << 40)))
 
 #define ISCSI_NTOHLL6(x) (uint64_t) \
       ( ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ff0000000000uLL) >> 40))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000ff00000000uLL) >> 24))     \
+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0xffffffffffff0000uLL) >> 16))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000ff000000uLL) >> 8))      \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000000000ff0000uLL) << 8))      \
+      | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x0000ffffffffffffuLL) << 16))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x000000000000ff00uLL) << 24))     \
       | ((uint64_t)( ((uint64_t)(x) & (uint64_t)0x00000000000000ffuLL) << 40)))