refresh

diff --git a/meta b/meta
index b118d7f60b08dd93caeeaff91d97fd18b10853d7..710bbf58270945aa05e0cc3c2bef699c42f80f2e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 5bd83dcd8e5d941f80d76c6b137c21524d55fe60
-Head: 79b3894075dc4f13e1d2d15ee54e0fd0d2eddb50
+Previous: 7d9d34f9fcbd47d4e5c40c3340f9d0e0e5ba5e3b
+Head: 0ad81adc9a54c2cc991cbf6a999ad21af6266c0c
 Applied:
-  1-5-librdmacm-rsocket-add-miss: c8e91e418291c3d29337e169b0ff6039e1b24072
-  refresh-temp: 79b3894075dc4f13e1d2d15ee54e0fd0d2eddb50
+  1-5-librdmacm-rsocket-add-miss: 0ad81adc9a54c2cc991cbf6a999ad21af6266c0c
 Unapplied:
   2-5-librdmacm-rsocket-added-mi: 6841eb657a1999eb0b9fe868ef655c3176458172
   3-5-librdmacm-rstream-initiali: 6edbcb82d7a5345c2337472285f2015501562dae

diff --git a/patches/1-5-librdmacm-rsocket-add-miss b/patches/1-5-librdmacm-rsocket-add-miss
index 7b48a2f5e268001706ffbcf8ec101614dad7b174..f791be7a07cb4d9acf0348fbc5b4be03a81f4f24 100644 (file)
--- a/patches/1-5-librdmacm-rsocket-add-miss
+++ b/patches/1-5-librdmacm-rsocket-add-miss
@@ -1,5 +1,5 @@
 Bottom: 7a63e115cc4adf073292cd3edca568d9910e1a6e
-Top:    f645979e703e3337aa2e7456b7e1742bc602ce6a
+Top:    145c31a6954c193a2ed1d3716d0fb4db0b11cd14
 Author: Dotan Barak <dotanb@dev.mellanox.co.il>
 Date:   2012-10-09 12:27:48 +0000
 
@@ -14,14 +14,24 @@ Reviewed-by: Yishai Hadas <yishaih@mellanox.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 4c4821b..278c8ec 100644
+index 4c4821b..5b65b12 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -2002,6 +2002,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
+@@ -2002,7 +2002,8 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
        va_start(args, cmd);
        switch (cmd) {
        case F_GETFL:
-+              va_end(args);
-               return (int) rs->fd_flags;
+-              return (int) rs->fd_flags;
++              ret = (int) rs->fd_flags;
++              break;
        case F_SETFL:
                param = va_arg(args, long);
+               if (param & O_NONBLOCK)
+@@ -2013,6 +2014,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
+               break;
+       default:
+               ret = ERR(ENOTSUP);
++              break;
+       }
+       va_end(args);
+       return ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ce4b919..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: f645979e703e3337aa2e7456b7e1742bc602ce6a
-Top:    145c31a6954c193a2ed1d3716d0fb4db0b11cd14
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-09 09:55:37 -0700
-
-Refresh of 1-5-librdmacm-rsocket-add-miss
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 278c8ec..5b65b12 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -2002,8 +2002,8 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
-       va_start(args, cmd);
-       switch (cmd) {
-       case F_GETFL:
--              va_end(args);
--              return (int) rs->fd_flags;
-+              ret = (int) rs->fd_flags;
-+              break;
-       case F_SETFL:
-               param = va_arg(args, long);
-               if (param & O_NONBLOCK)
-@@ -2014,6 +2014,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ )
-               break;
-       default:
-               ret = ERR(ENOTSUP);
-+              break;
-       }
-       va_end(args);
-       return ret;