From db39d570a5fc77f66e6c570e2a8a83c68af773cb Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 28 Jun 2013 10:14:51 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/add-support-for-preloading-ipv | 6 +++--- patches/refresh-temp | 22 ---------------------- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 22e22d7..e31c9fe 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: d29fe8d6f3947e76020c890c9d2e884cb0beeee2 -Head: 9fc44a55065e08b06a270eb226c43f7bdbcddb8e +Previous: dc24e47aa2df0e88563fda0800db588fad04cf1b +Head: ed439996785eb0fd775111a77d7d9b6146d08347 Applied: rmcfg: 977896dc127018271adae25f7d637e098bad33d5 acm_notes-txt-change-dos-forma: b07f140dd83b881c922f4c6b70cfa7145727044f @@ -12,8 +12,7 @@ Applied: increase-buffer-space-for-inet: 229be37676bff70a54464f09ac0604fafe77e820 ib_acme-c-support-ipv6-address: aa33290c7f81d8eb39ca1d2531eb2f15fe6f5490 convert-linux-header-files-fro: 5b940e35239149600253ba80d5086855dd67aa44 - add-support-for-preloading-ipv: 6f476e59fb0d21824643039a0679e24a07d4733c - refresh-temp: 9fc44a55065e08b06a270eb226c43f7bdbcddb8e + add-support-for-preloading-ipv: ed439996785eb0fd775111a77d7d9b6146d08347 Unapplied: add-option-to-allow-for-acm-ca: d70c340b1b7bb3d64d81768f4185b08415fbab55 notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e diff --git a/patches/add-support-for-preloading-ipv b/patches/add-support-for-preloading-ipv index 9957eae..182617e 100644 --- a/patches/add-support-for-preloading-ipv +++ b/patches/add-support-for-preloading-ipv @@ -1,5 +1,5 @@ Bottom: e1c84462b334facb3ab18f778540e29fdb917e65 -Top: 9decf32b2f8211eb48c3c4e180d20f6f43514428 +Top: 956788b56e125b90df9d1eb040f16f4e05e44fdf Author: Hal Rosenstock Date: 2013-06-27 21:48:11 +0300 @@ -80,7 +80,7 @@ index ec97b35..2ca7eec 100644 .SH "SEE ALSO" ibacm(7), ib_acme(1), rdma_cm(7) diff --git a/src/acm.c b/src/acm.c -index a37ebaa..f55ebc0 100644 +index a37ebaa..ae326e5 100644 --- a/src/acm.c +++ b/src/acm.c @@ -82,6 +82,11 @@ enum acm_route_preload { @@ -236,7 +236,7 @@ index a37ebaa..f55ebc0 100644 + else if (!stricmp("addr_preload", opt)) + addr_preload = acm_convert_addr_preload(value); + else if (!stricmp("addr_data_file", opt)) -+ strcpy(addr_data_file, opt); ++ strcpy(addr_data_file, value); } fclose(f); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index b59d78f..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: 9decf32b2f8211eb48c3c4e180d20f6f43514428 -Top: 956788b56e125b90df9d1eb040f16f4e05e44fdf -Author: Sean Hefty -Date: 2013-06-28 10:14:51 -0700 - -Refresh of add-support-for-preloading-ipv - ---- - -diff --git a/src/acm.c b/src/acm.c -index f55ebc0..ae326e5 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -3466,7 +3466,7 @@ static void acm_set_options(void) - else if (!stricmp("addr_preload", opt)) - addr_preload = acm_convert_addr_preload(value); - else if (!stricmp("addr_data_file", opt)) -- strcpy(addr_data_file, opt); -+ strcpy(addr_data_file, value); - } - - fclose(f); -- 2.46.0