commit

diff --git a/meta b/meta
index 67adffded815da68d1b43fafe671b06e022934ec..6ffb72a6262cd10de30d9dca9495c476d6fdc9fe 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 6b04e25490b6030109676d55da02d7030a50eebf
+Previous: fba6df8cbf1474020cdd7de9217f73f55a18e15e
 Head: 860b1a8784f1846be759eec46770cc723991479c
 Applied:
-  printf: ef84fae59dcaaa93d6be3a5baaec4d388daf1eee
   cont_of: e15e607d7759af7446d0184999736512b12d0cb3
   rping: 860b1a8784f1846be759eec46770cc723991479c
 Unapplied:

diff --git a/patches/printf b/patches/printf
deleted file mode 100644 (file)
index e9d4b67..0000000
--- a/patches/printf
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: fd25e5104198197967ac10d49db6570c49bf661c
-Top:    ac93da382386d7ab0239b28cdc00d6e3ed4470ea
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-03 15:18:29 -0700
-
-addrinfo: Remove debug printf calls
-
-These never should have made it into the commit.  :P
-
-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);
-               }