commit

diff --git a/meta b/meta
index 5886124eae44ed3ca69b5e51981334510d74f809..26d4ca228486987aa2697464f15d1a488e0a26f1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: af25c7ec051570085e0dab790960dbccd415099a
+Previous: 692d26e3a347a8988383bb87a59ddd2a4562ba18
 Head: 4c771a2a498204699ef8e91498214a9814422ee3
 Applied:
-  rs2: 9f25d83861922ca4b4842c1d81359239c15b0575
   rs3: 15cd6383ad5db6dea95ed7e25101a3270d2cfb83
   rs4: 4c771a2a498204699ef8e91498214a9814422ee3
 Unapplied:

diff --git a/patches/rs2 b/patches/rs2
deleted file mode 100644 (file)
index 04e57e2..0000000
--- a/patches/rs2
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: d79d5464622c07a1ee7c42051fee5fca02c52207
-Top:    69d5a78d671e7db0e0da70e3702c92eceac177a8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-04 13:22:10 -0700
-
-rsocket: Handle TCP_MAXSEG socket option
-
-netperf uses the TCP_MAXSEG socket option.  Add support for it.
-Problem reported by Sridhar Samudrala <sri@us.ibm.com>
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index c111797..e906fd4 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1713,6 +1713,9 @@ int rsetsockopt(int socket, int level, int optname,
-                       opt_on = *(int *) optval;
-                       ret = 0;
-                       break;
-+              case TCP_MAXSEG:
-+                      ret = 0;
-+                      break;
-               default:
-                       break;
-               }
-@@ -1799,6 +1802,12 @@ int rgetsockopt(int socket, int level, int optname,
-                       *((int *) optval) = !!(rs->tcp_opts & (1 << optname));
-                       *optlen = sizeof(int);
-                       break;
-+              case TCP_MAXSEG:
-+                      *((int *) optval) = (rs->cm_id && rs->cm_id->route.num_paths) ?
-+                                          1 << (7 + rs->cm_id->route.path_rec->mtu) :
-+                                          2048;
-+                      *optlen = sizeof(int);
-+                      break;
-               default:
-                       ret = ENOTSUP;
-                       break;