[IBAL, MT23108, MTHCA] Fix MAD response for cached attributes

to use GET_RESP as the method.

Submitted by: Anatoly Lesinko (anatolyl@voltaire.com)

git-svn-id: svn://openib.tc.cornell.edu/gen1@482 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/kernel/al_smi.c b/trunk/core/al/kernel/al_smi.c
index 2ebced74e0edf70b03a573fe2d59e3f89b0a0c4d..0a32e4dde146be00c447ddd44861456e9a7cf8bd 100644 (file)
--- a/trunk/core/al/kernel/al_smi.c
+++ b/trunk/core/al/kernel/al_smi.c
@@ -1,6 +1,7 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
  * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. \r
+ * Copyright (c) 2006 Voltaire Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -1551,7 +1552,7 @@ process_node_info(
        {\r
                p_smp = (ib_smp_t*)p_mad_resp->p_mad_buf;\r
                cl_memcpy( p_smp, p_mad, MAD_BLOCK_SIZE );\r
-               p_smp->method |= IB_MAD_METHOD_RESP_MASK;\r
+               p_smp->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
                if( p_smp->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                        p_smp->status = IB_SMP_DIRECTION;\r
                else\r
@@ -1621,7 +1622,8 @@ process_node_desc(
        if( status == IB_SUCCESS )\r
        {\r
                cl_memcpy( p_mad_resp->p_mad_buf, p_mad, MAD_BLOCK_SIZE );\r
-               p_mad_resp->p_mad_buf->method |= IB_MAD_METHOD_RESP_MASK;\r
+               p_mad_resp->p_mad_buf->method =\r
+                       (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
                if( p_mad_resp->p_mad_buf->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                        p_mad_resp->p_mad_buf->status = IB_SMP_DIRECTION;\r
                else\r

diff --git a/trunk/hw/mt23108/kernel/hca_smp.c b/trunk/hw/mt23108/kernel/hca_smp.c
index abae347021f73754d5cd67a8029ef24a723c6241..a1ea245d1ab522e456359da32e9167ac06afe166 100644 (file)
--- a/trunk/hw/mt23108/kernel/hca_smp.c
+++ b/trunk/hw/mt23108/kernel/hca_smp.c
@@ -1,5 +1,6 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
+ * Copyright (c) 2006 Voltaire Corporation.  All rights reserved.\r
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -73,11 +74,10 @@ mlnx_cachable_guid_info(
                        return FALSE;\r
                }\r
        }\r
-       \r
 \r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -126,10 +126,9 @@ mlnx_cachable_pkey_table(
                }\r
        }\r
 \r
-\r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -166,10 +165,9 @@ mlnx_cachable_sl_vl_table(
                }\r
        }\r
 \r
-\r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -218,10 +216,9 @@ mlnx_cachable_vl_arb_table(
                }\r
        }\r
 \r
-\r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r

diff --git a/trunk/hw/mthca/kernel/hca_smp.c b/trunk/hw/mthca/kernel/hca_smp.c
index 9a3207157424f8179f77b69d8f40108eabc84a2a..227400621c0bde4dc4ae4428812ceb3a6bd92ea5 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_smp.c
+++ b/trunk/hw/mthca/kernel/hca_smp.c
@@ -1,5 +1,6 @@
 /*\r
  * Copyright (c) 2005 SilverStorm Technologies.  All rights reserved.\r
+ * Copyright (c) 2006 Voltaire Corporation.  All rights reserved.
  *\r
  * This software is available to you under the OpenIB.org BSD license\r
  * below:\r
@@ -80,11 +81,10 @@ mlnx_cachable_guid_info(
                        return FALSE;\r
                }\r
        }\r
-       \r
 \r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -132,11 +132,10 @@ mlnx_cachable_pkey_table(
                        return FALSE;\r
                }\r
        }\r
-       \r
 \r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -172,11 +171,10 @@ mlnx_cachable_sl_vl_table(
                        return FALSE;\r
                }\r
        }\r
-       \r
 \r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r
@@ -224,11 +222,10 @@ mlnx_cachable_vl_arb_table(
                        return FALSE;\r
                }\r
        }\r
-       \r
 \r
        /* Setup the response mad. */\r
        cl_memcpy( p_mad_out, p_mad_in, MAD_BLOCK_SIZE );\r
-       p_mad_out->method |= IB_MAD_METHOD_RESP_MASK;\r
+       p_mad_out->method = (IB_MAD_METHOD_RESP_MASK | IB_MAD_METHOD_GET);\r
        if( p_mad_out->mgmt_class == IB_MCLASS_SUBN_DIR )\r
                p_mad_out->status = IB_SMP_DIRECTION;\r
        else\r