diff options
| author |   Ralph Campbell <ralphc@pathscale.com> | 2006-02-03 14:32:01 -0800 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2006-03-20 10:08:11 -0800 |
| commit | 5e9f71a16c56af7e2ff8b7ea251e0fd90b5de560 (patch) | |
| tree | d3b6aba0640173d0ce760140650dad51a76f9501 /drivers/infiniband/core/smi.h | |
| parent | IB/mad: Remove redundant check from smi_check_local_dr_smp() (diff) | |
| download | linux-dev-5e9f71a16c56af7e2ff8b7ea251e0fd90b5de560.tar.xz linux-dev-5e9f71a16c56af7e2ff8b7ea251e0fd90b5de560.zip | |
IB/mad: Simplify SMI by eliminating smi_check_local_dr_smp()
The call to ib_get_agent_port() shouldn't be possible to fail when
smi_check_local_dr_smp() is called from ib_mad_recv_done_handler().
When it is called from handle_outgoing_dr_smp(), the device and
port_num come from mad_agent_priv so I assume the call to
ib_get_agent_port() shouldn't fail either. In either case,
smi_check_local_smp() only uses the mad_agent pointer to check that
mad_agent->device->process_mad is not NULL. The device pointer would
have to be the same as the one passed to smi_check_local_dr_smp()
since that pointer is used later instead of the one checked in
smi_check_local_smp().
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/core/smi.h')
| -rw-r--r-- | drivers/infiniband/core/smi.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/infiniband/core/smi.h b/drivers/infiniband/core/smi.h index 2b3c40198f81..3011bfd86dc5 100644 --- a/drivers/infiniband/core/smi.h +++ b/drivers/infiniband/core/smi.h @@ -49,19 +49,16 @@ extern int smi_check_forward_dr_smp(struct ib_smp *smp); extern int smi_handle_dr_smp_send(struct ib_smp *smp, u8 node_type, int port_num); -extern int smi_check_local_dr_smp(struct ib_smp *smp, - struct ib_device *device, - int port_num); /* * Return 1 if the SMP should be handled by the local SMA/SM via process_mad */ -static inline int smi_check_local_smp(struct ib_mad_agent *mad_agent, - struct ib_smp *smp) +static inline int smi_check_local_smp(struct ib_smp *smp, + struct ib_device *device) { /* C14-9:3 -- We're at the end of the DR segment of path */ /* C14-9:4 -- Hop Pointer = Hop Count + 1 -> give to SMA/SM */ - return ((mad_agent->device->process_mad && + return ((device->process_mad && !ib_get_smp_direction(smp) && (smp->hop_ptr == smp->hop_cnt + 1))); } |