refresh

diff --git a/meta b/meta
index 5e07a0c7623ecd9aae5948cd812e97ff02b40e3b..2e8bd28faa035e4e73a245f93c16cce64b594fc6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0efdc90ae8961e064e6bba31aaf5193dda330299
-Head: 95101893e622d9211ceb465436e5de4d3e7058a3
+Previous: f2fce0f2753b9cfe1a523b385629fba17de15b8d
+Head: b6661981936a6240b03752a7dff93cac501dfbea
 Applied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa
@@ -10,8 +10,7 @@ Applied:
   opt-cp: 0c67e54602a5ce5524698f8aba7f543f356a865a
   gai: 22a27cbc8c17e08322878c0b84167c75dde413d2
   getreq: e7e1236356b8048c88055b7ff076d0674fd35de9
-  ep: a320aeb996239abb6e7b792863d758c704a0bfcc
-  refresh-temp: 95101893e622d9211ceb465436e5de4d3e7058a3
+  ep: b6661981936a6240b03752a7dff93cac501dfbea
 Unapplied:
   samples: 9cd5065dd57e012b7bb8dd20543bc00e675ebf73
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172

diff --git a/patches/ep b/patches/ep
index 7999c16de095a839d7f879a53b22cc7ffd7d6475..594738e247c585b47e3483c0c1e270e82e81f6f1 100644 (file)
--- a/patches/ep
+++ b/patches/ep
@@ -1,5 +1,5 @@
 Bottom: 406e38b83e8b4ee37f2eb19864bac90bae77c7e2
-Top:    df75a059b0d2b3c5fd0544055c2f2cbbb05a2707
+Top:    e0feb8e004252818d7c905f9f09ff1936417ca7d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-16 11:10:48 -0700
 
@@ -57,7 +57,7 @@ index 66932ca..70b5248 100644
   * rdma_destroy_id - Release a communication identifier.\r
   * @id: The communication identifier to destroy.\r
 diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 77cceb0..6e1f93a 100644
+index 77cceb0..68b3d10 100644
 --- a/trunk/ulp/librdmacm/src/cma.cpp
 +++ b/trunk/ulp/librdmacm/src/cma.cpp
 @@ -74,6 +74,8 @@ struct cma_id_private
@@ -82,7 +82,7 @@ index 77cceb0..6e1f93a 100644
        *id = event->id;\r
        (*id)->event = event;\r
        return 0;\r
-@@ -1343,6 +1351,84 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
+@@ -1343,6 +1351,86 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
        return 0;\r
  }\r
  \r
@@ -111,6 +111,7 @@ index 77cceb0..6e1f93a 100644
 +      return 0;\r
 +}\r
 +\r
++__declspec(dllexport)\r
 +int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
 +                                 struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\r
 +{\r
@@ -150,6 +151,7 @@ index 77cceb0..6e1f93a 100644
 +      return ret;\r
 +}\r
 +\r
++__declspec(dllexport)\r
 +void rdma_destroy_ep(struct rdma_cm_id *id)\r
 +{\r
 +      struct cma_id_private *id_priv;\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index caf5156..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: df75a059b0d2b3c5fd0544055c2f2cbbb05a2707
-Top:    e0feb8e004252818d7c905f9f09ff1936417ca7d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-16 13:50:19 -0700
-
-Refresh of ep
-
----
-
-diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
-index 6e1f93a..68b3d10 100644
---- a/trunk/ulp/librdmacm/src/cma.cpp
-+++ b/trunk/ulp/librdmacm/src/cma.cpp
-@@ -1376,6 +1376,7 @@ static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res,
-       return 0;\r
- }\r
- \r
-+__declspec(dllexport)\r
- int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res,\r
-                                  struct ibv_pd *pd, struct ibv_qp_init_attr *qp_init_attr)\r
- {\r
-@@ -1415,6 +1416,7 @@ err:
-       return ret;\r
- }\r
- \r
-+__declspec(dllexport)\r
- void rdma_destroy_ep(struct rdma_cm_id *id)\r
- {\r
-       struct cma_id_private *id_priv;