From 82c5b207bb3f528f580a48cfacda9a16f600df37 Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Thu, 13 Sep 2012 10:19:37 -0400 Subject: [PATCH] IB/qib: fix compliance regression in 3.5 Signed-off-by: Mike Marciniszyn --- .../0005-IB-qib-portinfo-compliance.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 linux-next-pending/0005-IB-qib-portinfo-compliance.patch diff --git a/linux-next-pending/0005-IB-qib-portinfo-compliance.patch b/linux-next-pending/0005-IB-qib-portinfo-compliance.patch new file mode 100644 index 0000000..5da8689 --- /dev/null +++ b/linux-next-pending/0005-IB-qib-portinfo-compliance.patch @@ -0,0 +1,32 @@ +IB/qib: fix compliance test failure C14-024#06_LocalPortNum + +From: Mike Marciniszyn + +Commit 3236b2d4 ("IB/qib: MADs with misset M_Keys should return failure") +introduced a return code assignment that unfortunately introduced +an unconditional exit for the routine due to the lack of braces. + +This patch adds the braces to correct the original patch. + +Reviewed-by: Dean Luick +Signed-off-by: Mike Marciniszyn +--- + drivers/infiniband/hw/qib/qib_mad.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c +index 4339021..3e55415 100644 +--- a/drivers/infiniband/hw/qib/qib_mad.c ++++ b/drivers/infiniband/hw/qib/qib_mad.c +@@ -463,9 +463,10 @@ static int subn_get_portinfo(struct ib_smp *smp, struct ib_device *ibdev, + if (port_num != port) { + ibp = to_iport(ibdev, port_num); + ret = check_mkey(ibp, smp, 0); +- if (ret) ++ if (ret) { + ret = IB_MAD_RESULT_FAILURE; + goto bail; ++ } + } + } + -- 2.41.0