delete

diff --git a/meta b/meta
index 91cedb87c5b635b4139678825b68334d663005c0..1a4f70350835848031b8f57cbe20e7e740e979f9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 372c29a3d45f655cbc38dc382e6ecd43efd53172
+Previous: 091dc82380941b8655b91319018a0d43c1c880ee
 Head: 73643c1926aeef6940c0635561bc7534fc084290
 Applied:
 Unapplied:
-  umad-dbg: 06ac17849b08b8b6d2dcd04d6ee7b4e52311044f
   errno: 929d92395c4a97ce2b64c42ce2e1a4dcbde17fa4
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
   port_attr: 6cb488a1a7ddc36e7017499d52152f0267669e02

diff --git a/patches/umad-dbg b/patches/umad-dbg
deleted file mode 100644 (file)
index 8a1ab07..0000000
--- a/patches/umad-dbg
+++ /dev/null
@@ -1,185 +0,0 @@
-Bottom: ae012808464ea9bb457205f559fb8944e1e4f435
-Top:    26a8eb25667822a02ed5c2ac67630ce50939747f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-15 10:28:08 -0700
-
-libibumad debugging
-
-
----
-
-diff --git a/trunk/core/al/al_mad.c b/trunk/core/al/al_mad.c
-index 4576fa8..52c6940 100644
---- a/trunk/core/al/al_mad.c
-+++ b/trunk/core/al/al_mad.c
-@@ -61,6 +61,7 @@
- \r
- #define AL_RMPP_WINDOW                        16                              /* Max size of RMPP window */\r
- #define AL_REASSEMBLY_TIMEOUT 5000                    /* 5 seconds */\r
-+#define AL_RMPP_RETRIES                       5\r
- \r
- static void\r
- __cleanup_mad_disp(\r
-@@ -1452,6 +1453,12 @@ __init_send_mad(
-                       return IB_INVALID_SETTING;\r
-               }\r
- \r
-+              if( !p_mad_element->timeout_ms )\r
-+                      p_mad_element->timeout_ms = AL_REASSEMBLY_TIMEOUT;\r
-+\r
-+              if( !h_send->retry_cnt )\r
-+                      h_send->retry_cnt = AL_RMPP_RETRIES;\r
-+\r
-               p_rmpp_hdr->rmpp_version = rmpp_version;\r
-               p_rmpp_hdr->rmpp_type = IB_RMPP_TYPE_DATA;\r
-               ib_rmpp_set_resp_time( p_rmpp_hdr, IB_RMPP_NO_RESP_TIME );\r
-diff --git a/trunk/ulp/libibumad/include/infiniband/umad.h b/trunk/ulp/libibumad/include/infiniband/umad.h
-index 712d021..f6b41ac 100644
---- a/trunk/ulp/libibumad/include/infiniband/umad.h
-+++ b/trunk/ulp/libibumad/include/infiniband/umad.h
-@@ -63,13 +63,13 @@ typedef struct ib_mad_addr
-       uint8_t                 gid_index;\r
-       uint8_t                 gid[16];\r
- \r
--      uint8_t                 grh_present;\r
-+      uint8_t                 traffic_class;\r
-       uint8_t                 reserved_grh;\r
-       uint16_t                lid;\r
-       uint8_t                 sl;\r
-       uint8_t                 path_bits;\r
-       uint8_t                 reserved_rate;\r
--      uint8_t                 traffic_class;\r
-+      uint8_t                 grh_present;\r
- \r
- }     ib_mad_addr_t;\r
- \r
-diff --git a/trunk/ulp/libibumad/src/umad.cpp b/trunk/ulp/libibumad/src/umad.cpp
-index cdf73fd..99a9187 100644
---- a/trunk/ulp/libibumad/src/umad.cpp
-+++ b/trunk/ulp/libibumad/src/umad.cpp
-@@ -49,7 +49,6 @@ typedef struct um_port
-       IWMProvider *prov;\r
-       NET64           dev_guid;\r
-       OVERLAPPED      overlap;\r
--      BOOL            pending;\r
-       UINT8           port_num;\r
- \r
- }     um_port_t;\r
-@@ -548,6 +547,23 @@ size_t umad_size(void)
-       return sizeof(struct ib_user_mad);\r
- }\r
- \r
-+static void umad_convert_addr(struct ib_mad_addr *addr, WM_MAD_AV *av)\r
-+{\r
-+      av->VersionClassFlow = htonl((6 << 28) | (((uint32_t) addr->traffic_class) << 20) |\r
-+                                                               (addr->flow_label & 0x000FFFFF));\r
-+      av->Reserved = 0;\r
-+      av->StaticRate = 0;\r
-+}\r
-+\r
-+static void umad_convert_av(WM_MAD_AV *av, struct ib_mad_addr *addr)\r
-+{\r
-+      uint32_t ver_class_flow;\r
-+\r
-+      ver_class_flow = ntohl(av->VersionClassFlow);\r
-+      addr->flow_label = ver_class_flow & 0x000FFFFF;\r
-+      addr->traffic_class = (uint8_t) (ver_class_flow >> 20);\r
-+}\r
-+\r
- __declspec(dllexport)\r
- int umad_send(int portid, int agentid, void *umad, int length,\r
-                         int timeout_ms, int retries)\r
-@@ -562,14 +578,25 @@ int umad_send(int portid, int agentid, void *umad, int length,
-       mad->retries    = (uint32_t) retries;\r
-       mad->length             = (uint32_t) length;\r
- \r
-+      umad_convert_addr(&mad->addr, &((WM_MAD *) mad)->Address);\r
-       hr = ports[portid].prov->Send((WM_MAD *) mad, NULL);\r
-+      umad_convert_av(&((WM_MAD *) mad)->Address, &mad->addr);\r
-       if (FAILED(hr)) {\r
-+              _set_errno(EIO);\r
-               return GetLastError();\r
-       }\r
- \r
-       return 0;\r
- }\r
- \r
-+static void umad_cancel_recv(um_port_t *port)\r
-+{\r
-+      DWORD bytes;\r
-+\r
-+      port->prov->CancelOverlappedRequests();\r
-+      port->prov->GetOverlappedResult(&port->overlap, &bytes, TRUE);\r
-+}\r
-+\r
- __declspec(dllexport)\r
- int umad_recv(int portid, void *umad, int *length, int timeout_ms)\r
- {\r
-@@ -579,29 +606,25 @@ int umad_recv(int portid, void *umad, int *length, int timeout_ms)
- \r
-       port = &ports[portid];\r
-       hr = port->prov->Receive(mad, sizeof(WM_MAD) + (size_t) *length, &port->overlap);\r
--\r
-       if (hr == WV_IO_PENDING) {\r
--              if (port->pending && timeout_ms == 0) {\r
--                      do {\r
--                              hr = WaitForSingleObject(port->overlap.hEvent, 250);\r
--                      } while (hr == WAIT_TIMEOUT && port->pending);\r
--              } else {\r
--                      hr = WaitForSingleObject(port->overlap.hEvent, (DWORD) timeout_ms);\r
--                      if (hr == WAIT_TIMEOUT) {\r
--                              return -EWOULDBLOCK;\r
--                      }\r
-+              hr = WaitForSingleObject(port->overlap.hEvent, (DWORD) timeout_ms);\r
-+              if (hr == WAIT_TIMEOUT) {\r
-+                      umad_cancel_recv(port);\r
-+                      _set_errno(EWOULDBLOCK);\r
-+                      return -EWOULDBLOCK;\r
-               }\r
-       }\r
- \r
-       if (FAILED(hr)) {\r
-+              _set_errno(EIO);\r
-               return -EIO;\r
-       }\r
- \r
-       if (mad->Length <= (UINT32) *length) {\r
--              port->pending = FALSE;\r
-               hr = (HRESULT) mad->Id;\r
-+              umad_convert_av(&mad->Address, &((struct ib_user_mad *) mad)->addr);\r
-       } else {\r
--              errno = ENOSPC;\r
-+              _set_errno(ENOSPC);\r
-               hr = -ENOSPC;\r
-       }\r
- \r
-@@ -618,19 +641,20 @@ int umad_poll(int portid, int timeout_ms)
- \r
-       port = &ports[portid];\r
-       hr = port->prov->Receive(&mad, sizeof mad, &port->overlap);\r
--\r
-       if (hr == WV_IO_PENDING) {\r
-               hr = WaitForSingleObject(port->overlap.hEvent, (DWORD) timeout_ms);\r
-               if (hr == WAIT_TIMEOUT) {\r
-+                      umad_cancel_recv(port);\r
-+                      _set_errno(ETIMEDOUT);\r
-                       return -ETIMEDOUT;\r
-               }\r
-       }\r
- \r
-       if (FAILED(hr) && hr != ERROR_MORE_DATA) {\r
-+              _set_errno(EIO);\r
-               return -EIO;\r
-       }\r
- \r
--      port->pending = TRUE;\r
-       return 0;\r
- }\r
- \r
-@@ -682,7 +706,6 @@ int umad_register(int portid, int mgmt_class, int mgmt_version,
- __declspec(dllexport)\r
- int umad_unregister(int portid, int agentid)\r
- {\r
--      ports[portid].pending = FALSE;\r
-       return ports[portid].prov->Deregister((UINT64) agentid);\r
- }