refresh (create temporary patch)

diff --git a/meta b/meta
index dab0c3282cce560fb05bd7c8427f39d78e30f1ab..8affbac0a50fcd05cfe9d57b811b7e818af27ae7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: d3e9776e9032b1d73a7149a28c21ff729c6049e3
-Head: 1eff252c0991d7348a8e069d7f2aa6ee8c7c8615
+Previous: 501836090ef4e94aaf8e0ea17d907dd0c36c4caf
+Head: b6f3d2d202daa115b834c6057e55cb52a68157ee
 Applied:
   af-ib-conn: 1eff252c0991d7348a8e069d7f2aa6ee8c7c8615
+  refresh-temp: b6f3d2d202daa115b834c6057e55cb52a68157ee
 Unapplied:
   addrtype: 20738f850a5d3d5747b0f367b04853d0dcff58fd
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..421f880
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,32 @@
+Bottom: c3c95597a157fcea6aa3cbdacf6b26631247389b
+Top:    ac1a57ca92b5fde95dfda767f022d7afa3d2b0d9
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-01-18 16:09:22 -0800
+
+Refresh of af-ib-conn
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 187125f..08036ad 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -64,18 +64,6 @@ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
+ static int sock = -1;
+ static short server_port;
+ 
+-struct ib_connect_hdr {
+-      uint8_t  cma_version;
+-      uint8_t  ip_version; /* IP version: 7:4 */
+-      uint16_t port;
+-      uint32_t src_addr[4];
+-      uint32_t dst_addr[4];
+-#define cma_src_ip4 src_addr[3]
+-#define cma_src_ip6 src_addr[0]
+-#define cma_dst_ip4 dst_addr[3]
+-#define cma_dst_ip6 dst_addr[0]
+-};
+-
+ static int ucma_set_server_port(void)
+ {
+       FILE *f;