rename

diff --git a/meta b/meta
index 3d70c8928b132dc11e7b352ee1afc836e126ccd6..3b806c16f53c2ccb0703442ef33c2479c4f1cfe9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: d69822e2cce508e915dfc6d6b1a5647a1a9efe23
+Previous: c5044e85b071b3de5db56515b59b6814a5cbae35
 Head: 697ed433218e6aae1fcb64d26be36e80434b34e6
 Applied:
   af_ib: 697ed433218e6aae1fcb64d26be36e80434b34e6
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
-  addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a
+  dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a
 Hidden:

diff --git a/patches/addr_size b/patches/addr_size
deleted file mode 100644 (file)
index 0f7f6e6..0000000
--- a/patches/addr_size
+++ /dev/null
@@ -1,72 +0,0 @@
-Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
-Top:    751bb64c882bec91cf7294f667963cc1e8bbd7ff
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 14:30:40 -0800
-
-Pass address size through to acm_init_dest
-
-Include the address size when trying to obtain a destination.
-The size is required by acm_init_dest, but callers to that
-function exclude it.  The result is that max address is
-assumed and required.  This allows us to search for a destination
-based on data extracted directly from a path record, where
-the address size may only be 2 or 16 bytes, rather than the 64
-byte maximum that's currently required.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-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);

diff --git a/patches/dev-addrsize b/patches/dev-addrsize
new file mode 100644 (file)
index 0000000..0f7f6e6
--- /dev/null
+++ b/patches/dev-addrsize
@@ -0,0 +1,72 @@
+Bottom: a8e8aa49b3591176bc809c876eb5943ae719ce0d
+Top:    751bb64c882bec91cf7294f667963cc1e8bbd7ff
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-17 14:30:40 -0800
+
+Pass address size through to acm_init_dest
+
+Include the address size when trying to obtain a destination.
+The size is required by acm_init_dest, but callers to that
+function exclude it.  The result is that max address is
+assumed and required.  This allows us to search for a destination
+based on data extracted directly from a path record, where
+the address size may only be 2 or 16 bytes, rather than the 64
+byte maximum that's currently required.
+
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
+
+
+---
+
+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);