Fixes to suppress warnings related to structure padding.

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

diff --git a/branches/fab_cm_branch/core/al/al_dm.c b/branches/fab_cm_branch/core/al/al_dm.c
index 09b53f24e14d3cc5664d33a705ab773137ad084f..b823705dddfbbc4f366d649663e9dd26254414c9 100644 (file)
--- a/branches/fab_cm_branch/core/al/al_dm.c
+++ b/branches/fab_cm_branch/core/al/al_dm.c
@@ -213,7 +213,7 @@ ib_create_ioc(
                CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_CA_HANDLE\n") );\r
                return IB_INVALID_CA_HANDLE;\r
        }\r
-       if( !p_ioc_profile || ph_ioc )\r
+       if( !p_ioc_profile || !ph_ioc )\r
        {\r
                CL_TRACE_EXIT( AL_DBG_ERROR, g_al_dbg_lvl, ("IB_INVALID_PARAMETER\n") );\r
                return IB_INVALID_PARAMETER;\r

diff --git a/branches/fab_cm_branch/core/al/al_dm.h b/branches/fab_cm_branch/core/al/al_dm.h
index 1dc97f946dac65d521c2abe4b50b9f2b33c674b9..f220dd8751ad2955c5a8a9d2a29e09b70e400323 100644 (file)
--- a/branches/fab_cm_branch/core/al/al_dm.h
+++ b/branches/fab_cm_branch/core/al/al_dm.h
@@ -91,6 +91,7 @@ typedef enum _ioc_state                       /* An IOC represents a slot in an IO unit */
 }      ioc_state_t;\r
 \r
 \r
+#pragma warning(disable:4324)\r
 typedef struct _al_ioc\r
 {\r
        al_obj_t                                        obj;            /* Child of ib_ca_t */\r
@@ -104,6 +105,7 @@ typedef struct _al_ioc
        atomic32_t                                      in_use_cnt;\r
 \r
 }      al_ioc_t;\r
+#pragma warning(default:4324)\r
 \r
 \r
 typedef struct _al_svc_entry\r

diff --git a/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c b/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c
index dce540490fdc1e0ba423125f011e7f3152a6ca74..a017b659091c98dbc89b7d1403a411037869a11e 100644 (file)
--- a/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c
+++ b/branches/fab_cm_branch/core/al/kernel/al_ioc_pnp.c
@@ -257,17 +257,18 @@ typedef struct _iou_node
 *********/\r
 \r
 \r
+#pragma warning(disable:4324)\r
 typedef struct _iou_ioc\r
 {\r
        cl_map_item_t                   map_item;\r
        iou_node_t                              *p_iou;\r
        uint8_t                                 slot;\r
-       uint8_t                                 pad[7]; /* Align IOC profile on 64-bit boundary */\r
        ib_ioc_profile_t                profile;\r
        uint8_t                                 num_valid_entries;\r
        ib_svc_entry_t                  *p_svc_entries;\r
 \r
 }      iou_ioc_t;\r
+#pragma warning(default:4324)\r
 \r
 \r
 typedef enum _sweep_state\r

diff --git a/branches/fab_cm_branch/inc/iba/ib_al.h b/branches/fab_cm_branch/inc/iba/ib_al.h
index 02d7675f0d33a102028b5cf6201f73b4ed3afbb5..0aa34fbbe92d043b160c139dc37950beb2ac67ea 100644 (file)
--- a/branches/fab_cm_branch/inc/iba/ib_al.h
+++ b/branches/fab_cm_branch/inc/iba/ib_al.h
@@ -3536,6 +3536,7 @@ typedef struct _ib_apr_info
 *\r
 * SYNOPSIS\r
 */\r
+#pragma warning(disable:4324)\r
 typedef struct _ib_cm_req_rec\r
 {\r
        const void* __ptr64                     context;\r
@@ -3558,6 +3559,7 @@ typedef struct _ib_cm_req_rec
        const void* __ptr64                     sidr_context;\r
 \r
 }      ib_cm_req_rec_t;\r
+#pragma warning(default:4324)\r
 /*\r
 * FIELDS\r
 *      context\r

diff --git a/branches/fab_cm_branch/inc/iba/ib_types.h b/branches/fab_cm_branch/inc/iba/ib_types.h
index 493373d031a519f13b8162523d97394c301a899e..26f1667a558cd7e4b9723d9bbf8ced29b1023c7e 100644 (file)
--- a/branches/fab_cm_branch/inc/iba/ib_types.h
+++ b/branches/fab_cm_branch/inc/iba/ib_types.h
@@ -6862,6 +6862,7 @@ ib_dm_set_slot_lo_hi(
 /*\r
  *     Information describing an I/O controller\r
  */\r
+#pragma warning(disable:4324)\r
 typedef struct _ib_ioc_info\r
 {\r
        net64_t                                 chassis_guid;\r
@@ -6871,6 +6872,8 @@ typedef struct _ib_ioc_info
        ib_ioc_profile_t                profile;\r
 \r
 }      ib_ioc_info_t;\r
+#pragma warning(default:4324)\r
+\r
 \r
 /*\r
  * Defines known Communication management class versions\r

diff --git a/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h b/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h
index 1a99fa1b8dc78a7ac37872836a0678754c20b3ba..96d9e3dd3639f9c9daf2ef2e5c60c2bb21de1f78 100644 (file)
--- a/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h
+++ b/branches/fab_cm_branch/ulp/srp/kernel/srp_hba.h
@@ -44,12 +44,15 @@
 typedef struct _srp_session *p_srp_session_t;\r
 \r
 \r
+#pragma warning(disable:4324)\r
 typedef struct _srp_path_record\r
 {\r
        cl_list_item_t  list_item;\r
        ib_path_rec_t   path_rec;\r
 \r
 }      srp_path_record_t;\r
+#pragma warning(default:4324)\r
+\r
 \r
 typedef struct _srp_hba\r
 {\r