pop

diff --git a/meta b/meta
index 9bd43ccf5ed5ccce859f22e7d8be35565a698944..2c0dd7faeab4ec692f02d3f5797a78d86fab5275 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: 3243de10d672d0722be1eaf51ae0e93b1c917936
-Head: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
+Previous: 931bff4c33dccf8d88708ad03aa5df4cfa61c2c9
+Head: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
+  rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
 Unapplied:
-  rs-opt-qpsize: 624840f02ef94f140cdfae9d97c1d0235e4780d2
   rs-opt-inline: b624fedb7c85a3fa5b4911ebfe56815470248832
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f

diff --git a/patches/rs-opt-qpsize b/patches/rs-opt-qpsize
index ce60e5e1c68455277ef136612ce4d4c0e02fda0a..d374f5e5c42df8c4a01751a8ee457f8cd48ead11 100644 (file)
--- a/patches/rs-opt-qpsize
+++ b/patches/rs-opt-qpsize
@@ -1,5 +1,5 @@
-Bottom: 25d50cd3051d3f2dd1864415bb489d3f72afdb61
-Top:    802cf3a8498258b521ee1e4f058de10033261d48
+Bottom: 193d740232bd38b1fe0cecf8d619b84d9bb49e39
+Top:    72f7a43b64f1274756d81e397fc2c110bf58532b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:56:15 -0700
 
@@ -49,7 +49,7 @@ index f28eaf3..2f5215c 100644
  
  /*
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 15e28de..78d7338 100644
+index ee31e0c..f94e48a 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -265,8 +265,15 @@ static void rs_set_qp_size(struct rsocket *rs)
@@ -68,7 +68,7 @@ index 15e28de..78d7338 100644
  }
  
  static int rs_init_bufs(struct rsocket *rs)
-@@ -1691,12 +1698,27 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1711,12 +1718,27 @@ int rsetsockopt(int socket, int level, int optname,
                }
                break;
        case SOL_RDMA:
@@ -97,7 +97,7 @@ index 15e28de..78d7338 100644
                if (opt_on)
                        *opts |= (1 << optname);
                else
-@@ -1758,7 +1780,19 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1778,7 +1800,19 @@ int rgetsockopt(int socket, int level, int optname,
                }
                break;
        case SOL_RDMA: