From e99a205475f3bcc5b14112d46828bc5ccf379217 Mon Sep 17 00:00:00 2001 From: shefty Date: Wed, 23 Jul 2008 20:01:18 +0000 Subject: [PATCH] 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 git-svn-id: svn://openib.tc.cornell.edu/gen1@1434 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/hw/mlx4/kernel/hca/data.c | 1 - trunk/hw/mthca/kernel/hca_data.c | 1 - trunk/inc/iba/ib_types.h | 37 -------------------------------- 3 files changed, 39 deletions(-) diff --git a/trunk/hw/mlx4/kernel/hca/data.c b/trunk/hw/mlx4/kernel/hca/data.c index f4f0492b..52925d49 100644 --- 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) // prepare parameters event_rec.context = (void *)p_hca->ca_context; - event_rec.trap.info.port_num = ev->element.port_num; event_rec.type = ev->event; if (event_rec.type > IB_AE_UNKNOWN) { // CL_ASSERT(0); // This shouldn't happen diff --git a/trunk/hw/mthca/kernel/hca_data.c b/trunk/hw/mthca/kernel/hca_data.c index aa98771d..cb9a2ac7 100644 --- 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) // prepare parameters event_rec.context = (void *)hob_p->ca_context; - event_rec.trap.info.port_num = ev->element.port_num; event_rec.type = ev->event; if (event_rec.type > IB_AE_UNKNOWN) { // CL_ASSERT(0); // This shouldn't happen diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h index 49b9d4d3..c284e648 100644 --- 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. */ uint64_t vendor_specific; - /* The following structures are valid only for trap types. */ - union _trap - { - struct - { - uint16_t lid; - ib_net64_t port_guid; - uint8_t port_num; - - /* - * The following structure is valid only for - * P_KEY, Q_KEY, and M_KEY violation traps. - */ - struct - { - uint8_t sl; - uint16_t src_lid; - uint16_t dest_lid; - union _key - { - uint16_t pkey; - uint32_t qkey; - uint64_t mkey; - } key; - uint32_t src_qp; - uint32_t dest_qp; - ib_gid_t src_gid; - ib_gid_t dest_gid; - - } violation; - - } info; - - ib_net64_t sysimg_guid; - - } trap; - } ib_event_rec_t; /*******/ -- 2.41.0