winverbs branch: sync with trunk and OFED

git-svn-id: svn://openib.tc.cornell.edu/gen1@2122 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/docs/dontdiff.txt b/branches/winverbs/docs/dontdiff.txt
index cd1a40a8c1bb77561fd848e8b7c9047d4e7ff840..0aeffb629a4eaf58d59b0fc5ccdff5a7a23b5fcc 100644 (file)
--- a/branches/winverbs/docs/dontdiff.txt
+++ b/branches/winverbs/docs/dontdiff.txt
@@ -24,3 +24,4 @@ objfre_*
 *.bin\r
 *.rej\r
 *.orig\r
+obj
\ No newline at end of file

diff --git a/branches/winverbs/etc/user/inet.c b/branches/winverbs/etc/user/inet.c
index 28e3d5bd2583269f612ce13251742278cca07889..47ff212ce34095f251e1725f362b2fc383123bf1 100644 (file)
--- a/branches/winverbs/etc/user/inet.c
+++ b/branches/winverbs/etc/user/inet.c
@@ -32,6 +32,8 @@
  */\r
 \r
 #include <arpa/inet.h>\r
+#include <stdlib.h>\r
+#include <stdio.h>\r
 \r
 static int inet_pton4(const char *src, struct in_addr *addr)\r
 {\r
@@ -149,10 +151,66 @@ int inet_pton(int af, const char *src, void *dst)
 {\r
        switch (af) {\r
        case AF_INET:\r
-               return inet_pton4(src, dst);\r
+               return inet_pton4(src, (struct in_addr *) dst);\r
        case AF_INET6:\r
-               return inet_pton6(src, dst);\r
+               return inet_pton6(src, (struct in6_addr *) dst);\r
        default:\r
                return -1;\r
        }\r
 }\r
+\r
+static const char *inet_ntop4(const void *src, char *dst, socklen_t cnt)\r
+{\r
+       struct sockaddr_in in;\r
+\r
+       in.sin_family = AF_INET;\r
+       memcpy(&in.sin_addr, src, 4);\r
+       if (getnameinfo((struct sockaddr *) &in,\r
+                                       (socklen_t) sizeof(struct sockaddr_in),\r
+                                       dst, cnt, NULL, 0, NI_NUMERICHOST))\r
+               return NULL;\r
+\r
+       return dst;\r
+}\r
+\r
+static const char *inet_ntop6(const void *src, char *dst, socklen_t cnt)\r
+{\r
+       struct sockaddr_in6 in6;\r
+       char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
+       int i, n = 0;\r
+\r
+       memset(&in6, 0, sizeof in6);\r
+       in6.sin6_family = AF_INET6;\r
+       memcpy(&in6.sin6_addr, src, sizeof(struct in_addr6));\r
+\r
+       /*\r
+        * If no ipv6 support return simple IPv6 format rule:\r
+        * A series of "0's in a 16bit block can be represented by "0" \r
+        */\r
+       if (getnameinfo((struct sockaddr *) &in6, (socklen_t) (sizeof in6),\r
+                                       dst, cnt, NULL, 0, NI_NUMERICHOST)) \r
+       {\r
+                               \r
+               if (cnt < sizeof(tmp))\r
+                       return NULL;\r
+\r
+               for (i = 0; i < 8; i++) \r
+                       n += sprintf(tmp+n, "%s%x", i ? ":" : "",\r
+                                                ntohs(((unsigned short*) src)[i]));\r
+               tmp[n] = '\0';\r
+               strcpy(dst, tmp);\r
+       }\r
+       return dst;\r
+}\r
+\r
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)\r
+{\r
+       switch (af) {\r
+       case AF_INET:\r
+               return inet_ntop4(src, dst, cnt);\r
+       case AF_INET6:\r
+               return inet_ntop6(src, dst, cnt);\r
+       default:\r
+               return NULL;\r
+       }\r
+}\r

diff --git a/branches/winverbs/inc/iba/ib_types.h b/branches/winverbs/inc/iba/ib_types.h
index 2d86569b8b47468aab602333c184cf4ff09da553..aaa497b10b9aa2258a1f0593d3af51883806db3f 100644 (file)
--- a/branches/winverbs/inc/iba/ib_types.h
+++ b/branches/winverbs/inc/iba/ib_types.h
@@ -4489,6 +4489,14 @@ typedef struct _ib_port_info
 #define IB_PORT_LINK_SPEED_ENABLED_MASK                                0x0F\r
 #define IB_PORT_PHYS_STATE_MASK                        0xF0\r
 #define IB_PORT_PHYS_STATE_SHIFT               4\r
+#define IB_PORT_PHYS_STATE_NO_CHANGE            0\r
+#define IB_PORT_PHYS_STATE_SLEEP                1\r
+#define IB_PORT_PHYS_STATE_POLLING              2\r
+#define IB_PORT_PHYS_STATE_DISABLED             3\r
+#define IB_PORT_PHYS_STATE_PORTCONFTRAIN        4\r
+#define IB_PORT_PHYS_STATE_LINKUP               5\r
+#define IB_PORT_PHYS_STATE_LINKERRRECOVER       6\r
+#define IB_PORT_PHYS_STATE_PHYTEST              7\r
 #define IB_PORT_LNKDWNDFTSTATE_MASK            0x0F\r
 \r
 #define IB_PORT_CAP_RESV0                      (CL_NTOH32(0x00000001))\r

diff --git a/branches/winverbs/inc/kernel/rdma/verbs.h b/branches/winverbs/inc/kernel/rdma/verbs.h
index b4cf7a1eb0c79448536cc6c463d1154451b1f5d5..67f5eac4a89307c2b99a52d0a3861fb737a018d4 100644 (file)
--- a/branches/winverbs/inc/kernel/rdma/verbs.h
+++ b/branches/winverbs/inc/kernel/rdma/verbs.h
@@ -57,7 +57,6 @@ typedef struct _RDMA_INTERFACE_VERBS
 {\r
        INTERFACE               InterfaceHeader;\r
        ci_interface_t  Verbs;\r
-       void *                  p_hca_obj;\r
 \r
 }      RDMA_INTERFACE_VERBS;\r
 \r

diff --git a/branches/winverbs/inc/user/linux/arpa/inet.h b/branches/winverbs/inc/user/linux/arpa/inet.h
index 2c7b53c39ca4cbdfbd4676e352b434c53b844c38..18c13a0650ae320e140817f23bcfcdd679283bc4 100644 (file)
--- a/branches/winverbs/inc/user/linux/arpa/inet.h
+++ b/branches/winverbs/inc/user/linux/arpa/inet.h
@@ -36,8 +36,17 @@
 \r
 #include <ws2tcpip.h>\r
 \r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
 #if WINVER < 0x600\r
 int inet_pton(int af, const char *src, void *dst);\r
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);\r
+#endif\r
+\r
+#ifdef __cplusplus\r
+}\r
 #endif\r
 \r
 #endif /* _INET_H_ */\r

diff --git a/branches/winverbs/ulp/libibmad/include/infiniband/mad_osd.h b/branches/winverbs/ulp/libibmad/include/infiniband/mad_osd.h
index dde6e3a65b828d70c1e9eb6664c9cbbc3f4975f4..dff3a79e8c7523733e9bee386927d9c220e154c0 100644 (file)
--- a/branches/winverbs/ulp/libibmad/include/infiniband/mad_osd.h
+++ b/branches/winverbs/ulp/libibmad/include/infiniband/mad_osd.h
@@ -34,7 +34,7 @@
 #include <string.h>\r
 #include <windows.h>\r
 #include <winsock2.h>\r
-#include <ws2tcpip.h> \r
+#include <ws2tcpip.h>\r
 \r
 typedef unsigned __int8                uint8_t;\r
 typedef unsigned __int16       uint16_t;\r
@@ -48,7 +48,7 @@ typedef unsigned __int64      uint64_t;
 \r
 #define MAD_EXPORT     __declspec(dllexport)\r
 \r
-#define __attribute__(X)\r
+#define DEPRECATED\r
 \r
 #if !defined( __cplusplus )\r
 #define inline __inline\r
@@ -66,48 +66,4 @@ typedef unsigned __int64     uint64_t;
 #define random         rand\r
 #define srandom                srand\r
 \r
-static __inline\r
-const char * _inet_ntop(int family, const void *addr, char *dst, size_t len)\r
-{\r
-       if (family == AF_INET)\r
-       {\r
-               struct sockaddr_in in;\r
-               in.sin_family = AF_INET;\r
-               memcpy(&in.sin_addr, addr, 4);\r
-               if (getnameinfo((struct sockaddr *)&in,\r
-                               (socklen_t) (sizeof(struct sockaddr_in)),\r
-                               dst, len, NULL, 0, NI_NUMERICHOST))\r
-                       return NULL;\r
-       }\r
-       else if (family == AF_INET6)\r
-       {\r
-               struct sockaddr_in6 in6;\r
-               memset(&in6, 0, sizeof in6);\r
-               in6.sin6_family = AF_INET6;\r
-               memcpy(&in6.sin6_addr, addr, sizeof(struct in_addr6));\r
-\r
-               /* if no ipv6 support return simple IPv6 format rule:\r
-                * A series of "0's in a 16bit block can be represented by "0" \r
-                */\r
-               if (getnameinfo((struct sockaddr *)&in6, (socklen_t) (sizeof in6),\r
-                                dst, len, NULL, 0, NI_NUMERICHOST)) \r
-               {\r
-                       char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];\r
-                       int i, n=0;\r
-                                       \r
-                       if (len < sizeof(tmp))\r
-                               return NULL;\r
-\r
-                       for (i = 0; i < 8; i++) \r
-                               n += sprintf(tmp+n, "%s%x", \r
-                                            i?":":"",\r
-                                            ntohs(((unsigned short*)addr)[i]));\r
-                       tmp[n]='\0';\r
-                       strcpy(dst, tmp);\r
-               }\r
-       }\r
-       return dst;\r
-}\r
-#define inet_ntop _inet_ntop\r
-\r
 #endif /* _MAD_OSD_H_ */\r

diff --git a/branches/winverbs/ulp/libibmad/src/Sources b/branches/winverbs/ulp/libibmad/src/Sources
index e48761562b9a5ebd69c194f9c725853b27c71777..8c0e8174c51428db125252b62adeb87d20c30b93 100644 (file)
--- a/branches/winverbs/ulp/libibmad/src/Sources
+++ b/branches/winverbs/ulp/libibmad/src/Sources
@@ -10,7 +10,7 @@ TARGETTYPE = DYNLINK
 DLLDEF = $(OBJ_PATH)\$O\ibmad_exports.def\r
 \r
 DLLENTRY = DllMain\r
-USE_MSVCRT=1\r
+USE_MSVCRT = 1\r
 \r
 SOURCES = \\r
        ibmad_main.cpp \\r
@@ -28,10 +28,12 @@ SOURCES = \
        vendor.c\r
        \r
 INCLUDES =     ..\include\infiniband;\\r
-                       ..\..\libibmad\include;\\r
+                       ..\include;\\r
                        ..\..\libibverbs\include;\\r
                        ..\..\libibumad\include;\\r
-                       ..\..\..\inc;..\..\..\inc\user;\r
+                       ..\..\..\inc;\\r
+                       ..\..\..\inc\user;\\r
+                       ..\..\..\inc\user\linux;\r
 \r
 USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_IBMAD_SYMBOLS\r
 \r

diff --git a/branches/winverbs/ulp/libibmad/src/ibmad_main.cpp b/branches/winverbs/ulp/libibmad/src/ibmad_main.cpp
index 7a48a480b3919eb8bdf7d4be8f2d5f0e4563a47f..dc1d3743578b93902235441826e2748df70673e9 100644 (file)
--- a/branches/winverbs/ulp/libibmad/src/ibmad_main.cpp
+++ b/branches/winverbs/ulp/libibmad/src/ibmad_main.cpp
@@ -29,6 +29,10 @@
 \r
 #include <windows.h>\r
 \r
+#if WINVER < 0x600\r
+#include "..\..\..\..\etc\user\inet.c"\r
+#endif\r
+\r
 BOOLEAN WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)\r
 {\r
        UNREFERENCED_PARAMETER(hInstance);\r

diff --git a/branches/winverbs/ulp/libibmad/src/portid.c b/branches/winverbs/ulp/libibmad/src/portid.c
index de9e2d3e37cf6c1370aeb512777cab0b570a27ff..6f8fea2f2de1d98f904721a00fa57fc5c8ffce8a 100644 (file)
--- a/branches/winverbs/ulp/libibmad/src/portid.c
+++ b/branches/winverbs/ulp/libibmad/src/portid.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <arpa/inet.h>
 
 #include <infiniband/mad.h>
 

diff --git a/branches/winverbs/ulp/opensm/user/include/iba/ib_types.h b/branches/winverbs/ulp/opensm/user/include/iba/ib_types.h
index 288df2f90efc3bab1aebddb9e1cfd641eb4f49c9..92d018b1e85c37ec3713f89dca487a061fc9f712 100644 (file)
--- a/branches/winverbs/ulp/opensm/user/include/iba/ib_types.h
+++ b/branches/winverbs/ulp/opensm/user/include/iba/ib_types.h
@@ -7023,10 +7023,8 @@ typedef struct _ib_mad_notice_attr    // Total Size calc  Accumulated
          struct _ntc_144 {\r
                 ib_net16_t    pad1;\r
                 ib_net16_t    lid;             // lid where capability mask changed\r
-                uint8_t       pad2;\r
-                uint8_t       local_changes;\r
+                ib_net16_t    pad2;\r
                 ib_net32_t    new_cap_mask; // new capability mask\r
-                ib_net16_t    change_flgs;\r
          } PACK_SUFFIX ntc_144;\r
 \r
          struct _ntc_145 {\r
@@ -7086,21 +7084,6 @@ typedef struct _ib_mad_notice_attr    // Total Size calc  Accumulated
 }      PACK_SUFFIX ib_mad_notice_attr_t;\r
 #include <complib/cl_packoff.h>\r
 \r
-/**\r
- * Trap 259 masks\r
- */\r
-#define TRAP_259_MASK_SL (CL_HTON32(0xF0000000))\r
-#define TRAP_259_MASK_QP (CL_HTON32(0x00FFFFFF))\r
-\r
-/**\r
- * Trap 144 masks\r
- */\r
-#define TRAP_144_MASK_OTHER_LOCAL_CHANGES      0x01\r
-#define TRAP_144_MASK_SM_PRIORITY_CHANGE       (CL_HTON16(0x0008))\r
-#define TRAP_144_MASK_LINK_SPEED_ENABLE_CHANGE (CL_HTON16(0x0004))\r
-#define TRAP_144_MASK_LINK_WIDTH_ENABLE_CHANGE (CL_HTON16(0x0002))\r
-#define TRAP_144_MASK_NODE_DESCRIPTION_CHANGE  (CL_HTON16(0x0001))\r
-\r
 /****f* IBA Base: Types/ib_notice_is_generic\r
 * NAME\r
 *      ib_notice_is_generic\r