ib_types/events: remove trap data from event record

The trap data in the ib_event_rec is both incomplete (wrt the types of
traps that it can report) and unused.  Remove it to save stack space.

This will also make it cleaner to have event handlers per QP, SRQ, CQ, etc.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1434 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mlx4/kernel/hca/data.c b/trunk/hw/mlx4/kernel/hca/data.c
index f4f0492bdf453934f125e97ef52648f04dc0a9bf..52925d4948f150afcca8bec2166b99fd1eb90275 100644 (file)
--- a/trunk/hw/mlx4/kernel/hca/data.c
+++ b/trunk/hw/mlx4/kernel/hca/data.c
@@ -320,7 +320,6 @@ void ca_event_handler(struct ib_event *ev, void *context)
 \r
        // prepare parameters\r
        event_rec.context = (void *)p_hca->ca_context;\r
-       event_rec.trap.info.port_num = ev->element.port_num;\r
        event_rec.type = ev->event;\r
        if (event_rec.type > IB_AE_UNKNOWN) {\r
                // CL_ASSERT(0); // This shouldn't happen\r

diff --git a/trunk/hw/mthca/kernel/hca_data.c b/trunk/hw/mthca/kernel/hca_data.c
index aa98771d51fa092cc265677c7b14bc7463f2e56c..cb9a2ac7391295dad9f51dae0c27a70e4c8f4527 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_data.c
+++ b/trunk/hw/mthca/kernel/hca_data.c
@@ -356,7 +356,6 @@ void ca_event_handler(struct ib_event *ev, void *context)
 \r
        // prepare parameters\r
        event_rec.context = (void *)hob_p->ca_context;\r
-       event_rec.trap.info.port_num = ev->element.port_num;\r
        event_rec.type = ev->event;\r
        if (event_rec.type > IB_AE_UNKNOWN) {\r
                // CL_ASSERT(0); // This shouldn't happen\r

diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h
index 49b9d4d313f938a737267d00e98736b876b3a741..c284e648731e410d1a10a17f1f9837aaf5a2d950 100644 (file)
--- a/trunk/inc/iba/ib_types.h
+++ b/trunk/inc/iba/ib_types.h
@@ -8954,43 +8954,6 @@ typedef struct _ib_event_rec
        /* HCA vendor specific event information. */\r
        uint64_t                                vendor_specific;\r
 \r
-       /* The following structures are valid only for trap types. */\r
-       union _trap\r
-       {\r
-               struct\r
-               {\r
-                       uint16_t                        lid;\r
-                       ib_net64_t                      port_guid;\r
-                       uint8_t                         port_num;\r
-\r
-                       /*\r
-                        * The following structure is valid only for\r
-                        * P_KEY, Q_KEY, and M_KEY violation traps.\r
-                        */\r
-                       struct\r
-                       {\r
-                               uint8_t                 sl;\r
-                               uint16_t                src_lid;\r
-                               uint16_t                dest_lid;\r
-                               union _key\r
-                               {\r
-                                       uint16_t        pkey;\r
-                                       uint32_t        qkey;\r
-                                       uint64_t        mkey;\r
-                               } key;\r
-                               uint32_t                src_qp;\r
-                               uint32_t                dest_qp;\r
-                               ib_gid_t                src_gid;\r
-                               ib_gid_t                dest_gid;\r
-\r
-                       }       violation;\r
-\r
-               } info;\r
-\r
-               ib_net64_t      sysimg_guid;\r
-\r
-       }       trap;\r
-\r
 }      ib_event_rec_t;\r
 /*******/\r
 \r