summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHal Rosenstock <halr@voltaire.com>2006-04-12 21:29:10 -0400
committerRoland Dreier <rolandd@cisco.com>2006-04-19 11:40:11 -0700
commit64cb9c6aff273b1cd449e773c937378d68233f8b (patch)
treea39978e7cbc58de3edda228c95ca328ced510435
parentf80887d0b9e1af481dc4a30fc145dfed24ddfd59 (diff)
downloadop-kernel-dev-64cb9c6aff273b1cd449e773c937378d68233f8b.zip
op-kernel-dev-64cb9c6aff273b1cd449e773c937378d68233f8b.tar.gz
IB/mad: Fix RMPP version check during agent registration
Only check that RMPP version is not specified when MAD class does not support RMPP. Just because a class is allowed to use RMPP doesn't mean that rmpp_version needs to be set for the MAD agent to register. Checking this was a recent change which was too pedantic. Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/core/mad.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 3a702da..469b692 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -228,10 +228,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
goto error1;
}
/* Make sure class supplied is consistent with RMPP */
- if (ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {
- if (!rmpp_version)
- goto error1;
- } else {
+ if (!ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {
if (rmpp_version)
goto error1;
}
OpenPOWER on IntegriCloud