From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 30 Jun 2011 17:49:06 +0000 (-0700)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5cd29dd2696715e7b6ec5341e7d0bf52c95f7a95;p=~shefty%2Fibacm.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index 1c02480..881d1fe 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: d888df9047a0834c3c89dbc610429456309107d9
-Head: 984d49be7e3adfa88c4f4d073db0697f914ad066
+Previous: 4c64fb1f14aef12e1f1739a6553b8e05bb951521
+Head: 184cbfa5dea9b90e3f212438a99bf7c171a18d4c
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: 50c4373f67227780faa494f4a92867239aaaf2f1
   alias: 984d49be7e3adfa88c4f4d073db0697f914ad066
+  refresh-temp: 184cbfa5dea9b90e3f212438a99bf7c171a18d4c
 Unapplied:
   bldwrn: 754494566259b4da96d1c3d64c836d0fd45c4861
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..5f25ac0
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,31 @@
+Bottom: 722034575c4d25b55cfc2359502f5ed5399512a7
+Top:    721f7edb21f23623f4465fb7a0b8c028b939ca7c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-30 10:49:06 -0700
+
+Refresh of alias
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 7ae6938..82d5972 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1920,7 +1920,7 @@ acm_send_resolve(struct acm_ep *ep, struct acm_dest *dest,
+ 
+ static int acm_svr_select_src(struct acm_ep_addr_data *src, struct acm_ep_addr_data *dst)
+ {
+-	struct socket_addr addr;
++	union socket_addr addr;
+ 	socklen_t len;
+ 	int ret;
+ 	SOCKET s;
+@@ -1937,7 +1937,7 @@ static int acm_svr_select_src(struct acm_ep_addr_data *src, struct acm_ep_addr_d
+ 		len = sizeof(struct sockaddr_in);
+ 		break;
+ 	case ACM_EP_INFO_ADDRESS_IP6:
+-		addr.sin.sin6_family = AF_INET6;
++		addr.sin6.sin6_family = AF_INET6;
+ 		memcpy(&addr.sin6.sin6_addr, dst->info.addr, 16);
+ 		len = sizeof(struct sockaddr_in6);
+ 		break;