1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 03a59534f59e..b6f7f457fc55 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -201,7 +201,6 @@ int mthca_process_mad(struct ib_device *ibdev,
                       struct ib_mad *out_mad)
 {
         int err;
-        u8 status;
         u16 slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);
         u16 prev_lid = 0;
         struct ib_port_attr pattr;
@@ -252,17 +251,11 @@ int mthca_process_mad(struct ib_device *ibdev,
         err = mthca_MAD_IFC(to_mdev(ibdev),
                             mad_flags & IB_MAD_IGNORE_MKEY,
                             mad_flags & IB_MAD_IGNORE_BKEY,
-                            port_num, in_wc, in_grh, in_mad, out_mad,
-                            &status);
-        if (err) {
-                mthca_err(to_mdev(ibdev), "MAD_IFC failed\n");
-                return IB_MAD_RESULT_FAILURE;
-        }
-        if (status == MTHCA_CMD_STAT_BAD_PKT)
+                            port_num, in_wc, in_grh, in_mad, out_mad);
+        if (err == -EBADMSG)
                 return IB_MAD_RESULT_SUCCESS;
-        if (status) {
-                mthca_err(to_mdev(ibdev), "MAD_IFC returned status %02x\n",
-                          status);
+        else if (err) {
+                mthca_err(to_mdev(ibdev), "MAD_IFC returned %d\n", err);
                 return IB_MAD_RESULT_FAILURE;
         }