refresh

diff --git a/meta b/meta
index a7ddfb7c0cc6715c12ae49d51ddef4f31bcd3470..3bb504abcf84e72e98bafd27e5784d7ce94451c4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 03f84d0e0ad8eb7fcbaef3dc607c3309084dcc4b
-Head: 9af3c797ee768571f4a1c888d379955e01571fea
+Previous: 52529227158c906f83570be8b96a8b946bee40b3
+Head: 3afce107e2baec86c5541ed0acd992e37bcb992a
 Applied:
-  v6only: 36dbcc6dd62fc62a0bb8bc3cc82869eb4242fd4f
-  refresh-temp: 9af3c797ee768571f4a1c888d379955e01571fea
+  v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
 Unapplied:
   rselect: 1fdb8dc1bff60f2748e148a081aae55b7fa80034
   shut_wr: 1b1163ede00a5161a9790cbc1e23cf15737dc2e3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d844cc2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
-Top:    27bfde2fb2ab4ee3033c6b465d55530a614e6bed
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-26 16:40:05 -0700
-
-Refresh of v6only
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 860c63e..394fed4 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1933,6 +1933,7 @@ int rgetsockopt(int socket, int level, int optname,
-                       ret = ENOTSUP;
-                       break;
-               }
-+              break;
-       case SOL_RDMA:
-               switch (optname) {
-               case RDMA_SQSIZE:

diff --git a/patches/v6only b/patches/v6only
index bced2463e00fcfb0a7db71266992f8138f3fbc35..d4c18fd5901e9553871d6e31b400e41f89af7f44 100644 (file)
--- a/patches/v6only
+++ b/patches/v6only
@@ -1,5 +1,5 @@
 Bottom: b2be28c058bcea1f57039dd4966c64ac692e6bfa
-Top:    44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
+Top:    27bfde2fb2ab4ee3033c6b465d55530a614e6bed
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-12 12:02:04 -0700
 
@@ -23,7 +23,7 @@ index c0f83b1..1487f8f 100755
  };
  
 diff --git a/src/rsocket.c b/src/rsocket.c
-index a3c2c6a..860c63e 100644
+index a3c2c6a..394fed4 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -161,6 +161,7 @@ struct rsocket {
@@ -53,7 +53,7 @@ index a3c2c6a..860c63e 100644
        case SOL_RDMA:
                if (rs->state > rs_listening) {
                        ret = ERR(EINVAL);
-@@ -1910,6 +1923,16 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1910,6 +1923,17 @@ int rgetsockopt(int socket, int level, int optname,
                        break;
                }
                break;
@@ -67,6 +67,7 @@ index a3c2c6a..860c63e 100644
 +                      ret = ENOTSUP;
 +                      break;
 +              }
++              break;
        case SOL_RDMA:
                switch (optname) {
                case RDMA_SQSIZE: