From 217dd566a7103a4ad03975aab11bfd86abefb457 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 16 Aug 2010 15:50:08 -0700 Subject: [PATCH] refresh --- meta | 7 +++--- patches/refresh-temp | 55 -------------------------------------------- patches/startup | 54 ++++++------------------------------------- 3 files changed, 10 insertions(+), 106 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 0334a55a..edab4777 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 301ccbe346dbd5e2c91dbdf7fdd46272abfe1267 -Head: fe6ada6a0f792cadb00e423f5f28059d30999a5b +Previous: bedcd167143067d2ae261f997d0e159ec0e0fa46 +Head: 0cf4f29bd1e196166130c11661634c7cd1147468 Applied: sync: 452ce3b051e10e10363baa77834962a89267e052 pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa @@ -12,8 +12,7 @@ Applied: getreq: 1ef2ab06b60a1192a1b2af253d75e187ecc68381 ep: 47348de149bd19aa0f7d1ee293e5c2157c181c26 samples: 69798ede2a2f96a442fe907f87df6017f58ca998 - startup: e0b0e0d7b78f9b3292d4fe602c1fce7af20d742d - refresh-temp: fe6ada6a0f792cadb00e423f5f28059d30999a5b + startup: 0cf4f29bd1e196166130c11661634c7cd1147468 Unapplied: cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172 wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index ff39af8c..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,55 +0,0 @@ -Bottom: 38c2985a44cf7bf6c9797cc313edebe2f3e7ddd7 -Top: b2c734b11bd0f2946023e6ac06ccc9f4117f0a30 -Author: Sean Hefty -Date: 2010-08-16 15:50:02 -0700 - -Refresh of startup - ---- - -diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp -index 26a465a..5d53ca6 100644 ---- a/trunk/ulp/librdmacm/src/addrinfo.cpp -+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp -@@ -36,7 +36,6 @@ - - #include - #include --#include - - #include "cma.h" - #include -diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp -index 46ec273..835d020 100644 ---- a/trunk/ulp/librdmacm/src/cma.cpp -+++ b/trunk/ulp/librdmacm/src/cma.cpp -@@ -1359,7 +1359,6 @@ static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res, - int ret; - - ret = rdma_bind_addr(id, res->ai_src_addr); --printf("rdma_bind_addr %d\n", ret); - if (ret) - return ret; - -@@ -1385,21 +1384,17 @@ int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res, - struct rdma_cm_id *cm_id; - int ret; - --printf("rdma_create_ep\n"); - ret = rdma_create_id(NULL, &cm_id, NULL, (enum rdma_port_space) res->ai_port_space); --printf("rdma_create_id %d\n", ret); - if (ret) - return ret; - - if (res->ai_flags & RAI_PASSIVE) { --printf("rdma_create_ep - passive\n"); - ret = ucma_passive_ep(cm_id, res, pd, qp_init_attr); - if (ret) - goto err; - goto out; - } - --printf("rdma_create_ep - active\n"); - ret = rdma_resolve_addr(cm_id, res->ai_src_addr, res->ai_dst_addr, 2000); - if (ret) - goto err; diff --git a/patches/startup b/patches/startup index fbdf3cc5..81934d36 100644 --- a/patches/startup +++ b/patches/startup @@ -1,5 +1,5 @@ Bottom: 589dd94a34abf4e2921d4a8205615bc02ab645a2 -Top: 38c2985a44cf7bf6c9797cc313edebe2f3e7ddd7 +Top: b2c734b11bd0f2946023e6ac06ccc9f4117f0a30 Author: Sean Hefty Date: 2010-08-16 15:03:51 -0700 @@ -9,16 +9,10 @@ librdmacm: initialize wsa --- diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp -index b9642fe..26a465a 100644 +index b9642fe..5d53ca6 100644 --- a/trunk/ulp/librdmacm/src/addrinfo.cpp +++ b/trunk/ulp/librdmacm/src/addrinfo.cpp -@@ -36,11 +36,40 @@ - - #include - #include -+#include - - #include "cma.h" +@@ -41,6 +41,34 @@ #include #include @@ -53,7 +47,7 @@ index b9642fe..26a465a 100644 static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai) { memset(ai, 0, sizeof *ai); -@@ -136,12 +165,13 @@ int rdma_getaddrinfo(char *node, char *service, +@@ -136,12 +164,13 @@ int rdma_getaddrinfo(char *node, char *service, struct addrinfo *ai; int ret; @@ -68,7 +62,7 @@ index b9642fe..26a465a 100644 rai = (struct rdma_addrinfo *) malloc(sizeof(*rai)); if (!rai) { -@@ -149,6 +179,8 @@ int rdma_getaddrinfo(char *node, char *service, +@@ -149,6 +178,8 @@ int rdma_getaddrinfo(char *node, char *service, goto err1; } @@ -77,43 +71,9 @@ index b9642fe..26a465a 100644 ret = ucma_convert_to_rai(rai, ai); if (ret) goto err2; -@@ -208,4 +240,5 @@ void rdma_freeaddrinfo(struct rdma_addrinfo *res) +@@ -208,4 +239,5 @@ void rdma_freeaddrinfo(struct rdma_addrinfo *res) free(rai); } + ucma_shutdown(); - } -diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp -index 835d020..46ec273 100644 ---- a/trunk/ulp/librdmacm/src/cma.cpp -+++ b/trunk/ulp/librdmacm/src/cma.cpp -@@ -1359,6 +1359,7 @@ static int ucma_passive_ep(struct rdma_cm_id *id, struct rdma_addrinfo *res, - int ret; - - ret = rdma_bind_addr(id, res->ai_src_addr); -+printf("rdma_bind_addr %d\n", ret); - if (ret) - return ret; - -@@ -1384,17 +1385,21 @@ int rdma_create_ep(struct rdma_cm_id **id, struct rdma_addrinfo *res, - struct rdma_cm_id *cm_id; - int ret; - -+printf("rdma_create_ep\n"); - ret = rdma_create_id(NULL, &cm_id, NULL, (enum rdma_port_space) res->ai_port_space); -+printf("rdma_create_id %d\n", ret); - if (ret) - return ret; - - if (res->ai_flags & RAI_PASSIVE) { -+printf("rdma_create_ep - passive\n"); - ret = ucma_passive_ep(cm_id, res, pd, qp_init_attr); - if (ret) - goto err; - goto out; - } - -+printf("rdma_create_ep - active\n"); - ret = rdma_resolve_addr(cm_id, res->ai_src_addr, res->ai_dst_addr, 2000); - if (ret) - goto err; + } -- 2.46.0