From: Sean Hefty Date: Fri, 17 Dec 2010 22:33:29 +0000 (-0800) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7c2079faf9d155a545984d6ab688025ec6731d43;p=~shefty%2Fibacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index a412130..cf55d17 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: c14e2f4337c865986fa5356de21d32a45a97978e -Head: 12ef41d4c6e6425243b4b81103012028caeaa738 +Previous: 6a9c19f1e98431bc713e4871c7471f6399c5573b +Head: 79491d7ed43c18cae32f26665c9298c25d92e7c8 Applied: lmc: b355854c79a1e446e87684a41663ad5aae258b73 lid: 1c005908ee6c257f6fa290df8ce8a45e968d07ab @@ -9,5 +9,6 @@ Applied: format_lid: 8994e17d78c86c08edcc8067dda7392a97cc8a3f query_path: f26d98116f57bcead2f61462602b4776c12a0aae addr_size: 12ef41d4c6e6425243b4b81103012028caeaa738 + refresh-temp: 79491d7ed43c18cae32f26665c9298c25d92e7c8 Unapplied: Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..ee5065f --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,61 @@ +Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d +Top: 751bb64c882bec91cf7294f667963cc1e8bbd7ff +Author: Sean Hefty +Date: 2010-12-17 14:33:29 -0800 + +Refresh of addr_size + +--- + +diff --git a/src/acm.c b/src/acm.c +index 1f3c470..051496c 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -308,7 +308,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si + } + + static struct acm_dest * +-acm_alloc_dest(uint8_t addr_type, uint8_t *addr) ++acm_alloc_dest(uint8_t addr_type, uint8_t *addr, size_t size) + { + struct acm_dest *dest; + +@@ -318,14 +318,14 @@ acm_alloc_dest(uint8_t addr_type, uint8_t *addr) + return NULL; + } + +- acm_init_dest(dest, addr_type, addr, ACM_MAX_ADDRESS); ++ acm_init_dest(dest, addr_type, addr, size); + acm_log(1, "%s\n", dest->name); + return dest; + } + + /* Caller must hold ep lock. */ + static struct acm_dest * +-acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr) ++acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size) + { + struct acm_dest *dest, **tdest; + +@@ -353,17 +353,17 @@ acm_put_dest(struct acm_dest *dest) + } + + static struct acm_dest * +-acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr) ++acm_acquire_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr, size_t size) + { + struct acm_dest *dest; + + acm_format_name(2, log_data, sizeof log_data, +- addr_type, addr, ACM_MAX_ADDRESS); ++ addr_type, addr, size); + acm_log(2, "%s\n", log_data); + lock_acquire(&ep->lock); +- dest = acm_get_dest(ep, addr_type, addr); ++ dest = acm_get_dest(ep, addr_type, addr, size); + if (!dest) { +- dest = acm_alloc_dest(addr_type, addr); ++ dest = acm_alloc_dest(addr_type, addr, size); + if (dest) { + tsearch(dest, &ep->dest_map[addr_type - 1], acm_compare_dest); + (void) atomic_inc(&dest->refcnt);