From 9cf71b03529c25a13a2688882c7f7af44b351bd7 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 15 Dec 2010 17:34:07 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/lmc | 8 ++++---- patches/refresh-temp | 31 ------------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 66e45e3..198a418 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 0d23347d84a90891bb3b3398405e496704a17b02 -Head: 91ca04528e4b066cd68fb7054f024a4b00e8f347 +Previous: a84314b02061c8a9362daf3364a9ca1842a63e1d +Head: b355854c79a1e446e87684a41663ad5aae258b73 Applied: - lmc: 6f466455d64655ca852ff6942c44052592296c75 - refresh-temp: 91ca04528e4b066cd68fb7054f024a4b00e8f347 + lmc: b355854c79a1e446e87684a41663ad5aae258b73 Unapplied: xref-lid: 3dc679d022e813709a18afce79297bb0d74a7b29 ibacm-check-for-nodelay-on-pat: 1540687d721504ec1810aac7cc53ec7272415eb9 diff --git a/patches/lmc b/patches/lmc index f5a1d1e..01aabe4 100644 --- a/patches/lmc +++ b/patches/lmc @@ -1,5 +1,5 @@ Bottom: 1fcbb0d2b361b8a2ed7ce1d4252ecc8c4be8ae71 -Top: 44bac54467fee44e1945f9a0311472cc84ac5b50 +Top: b2af32a606dc3c3e64f150250320dc7d52426926 Author: Sean Hefty Date: 2010-12-15 17:23:26 -0800 @@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 4ec01e8..e8f7a74 100644 +index 4ec01e8..e0f0b94 100644 --- a/src/acm.c +++ b/src/acm.c @@ -112,7 +112,7 @@ struct acm_port @@ -24,7 +24,7 @@ index 4ec01e8..e8f7a74 100644 uint16_t pkey_cnt; uint16_t lid; - uint8_t lmc; -+ uint8_t lid_mask; ++ uint16_t lid_mask; uint8_t port_num; }; @@ -33,7 +33,7 @@ index 4ec01e8..e8f7a74 100644 } port->lid = attr.lid; - port->lmc = attr.lmc; -+ port->lid_mask = (1 << attr.lmc) - 1; ++ port->lid_mask = 0xffff - (1 << attr.lmc) - 1; acm_init_dest(&port->sa_dest, ACM_ADDRESS_LID, (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid)); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 49c7f7f..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,31 +0,0 @@ -Bottom: 44bac54467fee44e1945f9a0311472cc84ac5b50 -Top: b2af32a606dc3c3e64f150250320dc7d52426926 -Author: Sean Hefty -Date: 2010-12-15 17:34:07 -0800 - -Refresh of lmc - ---- - -diff --git a/src/acm.c b/src/acm.c -index e8f7a74..e0f0b94 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -112,7 +112,7 @@ struct acm_port - int gid_cnt; - uint16_t pkey_cnt; - uint16_t lid; -- uint8_t lid_mask; -+ uint16_t lid_mask; - uint8_t port_num; - }; - -@@ -2582,7 +2582,7 @@ static void acm_init_port(struct acm_port *port) - break; - } - port->lid = attr.lid; -- port->lid_mask = (1 << attr.lmc) - 1; -+ port->lid_mask = 0xffff - (1 << attr.lmc) - 1; - - acm_init_dest(&port->sa_dest, ACM_ADDRESS_LID, - (uint8_t *) &attr.sm_lid, sizeof(attr.sm_lid)); -- 2.46.0