refresh

diff --git a/meta b/meta
index 37b835489785fcd97acb579a0ad97f85a823717a..41c7dd283329b225b2d83c05fc05d9187df76e12 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 53f0dcecef635949f3e6c4fe0118552e5ac94045
-Head: 2e87e4a64a7c6f821af2d49f57edf0332330dcae
+Previous: fd8736c0e7425167cdfc29b28ec39deac772e64c
+Head: a9d6145c5a8fae932052b003a1d00eaad0b76c0f
 Applied:
   rping: 5ed551f9ebc2af74eb2e330b258f0203cbf381e3
-  printf: 1b8918cff5cdad6593639a09a122178d069ab750
-  refresh-temp: 2e87e4a64a7c6f821af2d49f57edf0332330dcae
+  printf: a9d6145c5a8fae932052b003a1d00eaad0b76c0f
 Unapplied:
   cont_of: 3c70a581f12975b49cd1aac0236f09c6b8fb9950
   af-ib-conn: 5ce5f56950e0ed453c1798aedfa717bd18a2a754

diff --git a/patches/printf b/patches/printf
index ca8bac6c4afdeb57a7be5eb621f4d373df388f9f..191dee4b9e36bbc315313f3ff70f6ddfd1a5d461 100644 (file)
--- a/patches/printf
+++ b/patches/printf
@@ -1,5 +1,5 @@
 Bottom: cf9695fcbeea51e0388858a8b307228c9fdaaa42
-Top:    cf9695fcbeea51e0388858a8b307228c9fdaaa42
+Top:    369a03a382613dbf4a04fdc42f8f3107226e2fdc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-03 15:18:29 -0700
 
@@ -12,4 +12,50 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/addrinfo.c b/src/addrinfo.c
+index e7643f7..68eaddd 100755
+--- a/src/addrinfo.c
++++ b/src/addrinfo.c
+@@ -136,7 +136,6 @@ static int ucma_convert_in6(int ps, struct sockaddr_ib **dst, socklen_t *dst_len
+       *dst = calloc(1, sizeof(struct sockaddr_ib));
+       if (!(*dst))
+               return ERR(ENOMEM);
+-printf("converting ipv6 to ib\n");
+ 
+       (*dst)->sib_family = AF_IB;
+       (*dst)->sib_pkey = 0xFFFF;
+@@ -145,7 +144,6 @@ printf("converting ipv6 to ib\n");
+                   src->sin6_addr.s6_addr32[1], src->sin6_addr.s6_addr32[2],
+                   src->sin6_addr.s6_addr32[3]);
+       ucma_set_sid(ps, (struct sockaddr *) src, *dst);
+-printf("sid %llx %llx\n", (*dst)->sib_sid, (*dst)->sib_sid_mask);
+       (*dst)->sib_scope_id = src->sin6_scope_id;
+ 
+       *dst_len = sizeof(struct sockaddr_ib);
+@@ -169,7 +167,6 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+                       break;
+               }
+       }
+-printf("qp type %d\n", rai->ai_qp_type);
+ 
+       if (hints->ai_port_space) {
+               rai->ai_port_space = hints->ai_port_space;
+@@ -183,7 +180,6 @@ printf("qp type %d\n", rai->ai_qp_type);
+                       break;
+               }
+       }
+-printf("port space %d\n", rai->ai_port_space);
+ 
+       if (ai->ai_flags & AI_PASSIVE) {
+               rai->ai_flags = RAI_PASSIVE;
+@@ -198,10 +194,8 @@ printf("port space %d\n", rai->ai_port_space);
+                                              &rai->ai_src_len,
+                                              (struct sockaddr_in6 *) ai->ai_addr,
+                                              ai->ai_addrlen);
+-printf("using af ib \n");
+               } else {
+                       rai->ai_family = ai->ai_family;
+-printf("af %d\n", rai->ai_family);
+                       ret = ucma_copy_addr(&rai->ai_src_addr, &rai->ai_src_len,
+                                            ai->ai_addr, ai->ai_addrlen);
+               }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 663302b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: cf9695fcbeea51e0388858a8b307228c9fdaaa42
-Top:    369a03a382613dbf4a04fdc42f8f3107226e2fdc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-03 15:18:57 -0700
-
-Refresh of printf
-
----
-
-diff --git a/src/addrinfo.c b/src/addrinfo.c
-index e7643f7..68eaddd 100755
---- a/src/addrinfo.c
-+++ b/src/addrinfo.c
-@@ -136,7 +136,6 @@ static int ucma_convert_in6(int ps, struct sockaddr_ib **dst, socklen_t *dst_len
-       *dst = calloc(1, sizeof(struct sockaddr_ib));
-       if (!(*dst))
-               return ERR(ENOMEM);
--printf("converting ipv6 to ib\n");
- 
-       (*dst)->sib_family = AF_IB;
-       (*dst)->sib_pkey = 0xFFFF;
-@@ -145,7 +144,6 @@ printf("converting ipv6 to ib\n");
-                   src->sin6_addr.s6_addr32[1], src->sin6_addr.s6_addr32[2],
-                   src->sin6_addr.s6_addr32[3]);
-       ucma_set_sid(ps, (struct sockaddr *) src, *dst);
--printf("sid %llx %llx\n", (*dst)->sib_sid, (*dst)->sib_sid_mask);
-       (*dst)->sib_scope_id = src->sin6_scope_id;
- 
-       *dst_len = sizeof(struct sockaddr_ib);
-@@ -169,7 +167,6 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
-                       break;
-               }
-       }
--printf("qp type %d\n", rai->ai_qp_type);
- 
-       if (hints->ai_port_space) {
-               rai->ai_port_space = hints->ai_port_space;
-@@ -183,7 +180,6 @@ printf("qp type %d\n", rai->ai_qp_type);
-                       break;
-               }
-       }
--printf("port space %d\n", rai->ai_port_space);
- 
-       if (ai->ai_flags & AI_PASSIVE) {
-               rai->ai_flags = RAI_PASSIVE;
-@@ -198,10 +194,8 @@ printf("port space %d\n", rai->ai_port_space);
-                                              &rai->ai_src_len,
-                                              (struct sockaddr_in6 *) ai->ai_addr,
-                                              ai->ai_addrlen);
--printf("using af ib \n");
-               } else {
-                       rai->ai_family = ai->ai_family;
--printf("af %d\n", rai->ai_family);
-                       ret = ucma_copy_addr(&rai->ai_src_addr, &rai->ai_src_len,
-                                            ai->ai_addr, ai->ai_addrlen);
-               }