From: Sean Hefty Date: Mon, 21 May 2012 23:46:34 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=88f16ba09ac7e2722a411d4ae17d7b7785e5e33e;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index 2c0cbc18..cbdb7b7c 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: fc78f0f0e245f90333f6d18ef038489cdbad2610 -Head: 4bd520ce45cf7ce7e33f94f9507c0d6d74eae2bd +Previous: c1e724db870414f234ec5fe8e067f9a35096ba8c +Head: 0ae80c899c8cdf23c9dd8db0a934fd87c259c455 Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816 conn-err: 4bd520ce45cf7ce7e33f94f9507c0d6d74eae2bd + refresh-temp: 0ae80c899c8cdf23c9dd8db0a934fd87c259c455 Unapplied: rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4 rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..de662e57 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,27 @@ +Bottom: a4f930386d1079ec83f29bd0c722114770f6554d +Top: 3913d172c2d623b9aa46a39a6b725092c2b0d3ca +Author: Sean Hefty +Date: 2012-05-21 16:46:34 -0700 + +Refresh of conn-err + +--- + +diff --git a/examples/rstream.c b/examples/rstream.c +index cd8a962..34ff421 100644 +--- a/examples/rstream.c ++++ b/examples/rstream.c +@@ -481,8 +481,11 @@ static int client_connect(void) + + len = sizeof err; + ret = getsockopt(rs, SOL_SOCKET, SO_ERROR, &err, &len); +- if (ret || err) { +- ret = ret ? ret : err; ++ if (ret) ++ goto err; ++ if (err) { ++ ret = rdma_seterrno(err); ++ perror("async rconnect") + goto err; + } + }