From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 15 Nov 2010 22:04:11 +0000 (-0800)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=74cdd4698256902baad4d122f2b538440b2511fc;p=~shefty%2Fibacm.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 59c69ee..e52a522 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: a74236b4b519c9bda274c6de7cd6a35c4480e59d
-Head: 9919a1d954f16ef29ae5d9674855c61710af5a27
+Previous: d5e02b65c102d63b779bcd8c52d0eeae6a9f7fd7
+Head: 278ed7acd7bc8138a22ceb6aa90a165de5ecf47e
 Applied:
   logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b
   acm_snoop: bfcb41cccea5442ff7996133c7dd8e11362b041e
   logging2: 9919a1d954f16ef29ae5d9674855c61710af5a27
+  refresh-temp: 278ed7acd7bc8138a22ceb6aa90a165de5ecf47e
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..e210492
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,31 @@
+Bottom: 9962a940efd219c52418715f8e1c4d496699b292
+Top:    a73356f8275f4ece6f73baa1869b2fcabd14f560
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-11-15 14:04:11 -0800
+
+Refresh of logging2
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index daa0985..51836a8 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -254,7 +254,6 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+ 		fprintf(flog, "%s\n", ip_addr);
+ 		break;
+ 	case ACM_EP_INFO_ADDRESS_IP6:
+-	case ACM_ADDRESS_GID:
+ 		inet_ntop(AF_INET6, addr, ip_addr, ACM_MAX_ADDRESS);
+ 		fprintf(flog, "%s\n", ip_addr);
+ 		break;
+@@ -263,9 +262,6 @@ static void acm_log_addr(int level, const char *msg, uint16_t addr_type, uint8_t
+ 		fprintf(flog, "path record, SLID 0x%x, DLID 0x%x\n",
+ 			ntohs(path->slid), ntohs(path->dlid));
+ 		break;
+-	case ACM_ADDRESS_LID:
+-		fprintf(flog, "LID 0x%x\n", *((uint16_t *) addr));
+-		break;
+ 	default:
+ 		fprintf(flog, "unknown address 0x%x\n", addr_type);
+ 	}