summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/hfi1/mad.c
diff options
context:
space:
mode:
authorDon Hiatt <don.hiatt@intel.com>2017-12-22 08:46:00 -0800
committerJason Gunthorpe <jgg@mellanox.com>2017-12-22 13:46:11 -0700
commit2e903b611b3e5b6ef1bf875a747368ec6b30f667 (patch)
treeed24694f10c4c4c1d5027e6333dcea29a3c3b627 /drivers/infiniband/hw/hfi1/mad.c
parent2ef7f2e2706cee6ad7b5eb6ef8d85824008f0425 (diff)
downloadlinux-stable-2e903b611b3e5b6ef1bf875a747368ec6b30f667.tar.gz
linux-stable-2e903b611b3e5b6ef1bf875a747368ec6b30f667.tar.bz2
linux-stable-2e903b611b3e5b6ef1bf875a747368ec6b30f667.zip
IB/hfi1: Change slid arg in ingress_pkey_table_fail to 32bit
Change the slid arg to ingress_pkey_table_fail() to a full 32Bits and do not convert to 16Bits in caller. This is so we can keep everything 32bit in the kernel and only change to 16bit at the uapi boundary. Signed-off-by: Don Hiatt <don.hiatt@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/mad.c')
-rw-r--r--drivers/infiniband/hw/hfi1/mad.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index cf8dba34fe30..34547a48a445 100644
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -4348,11 +4348,7 @@ static int opa_local_smp_check(struct hfi1_ibport *ibp,
*/
if (pkey == LIM_MGMT_P_KEY || pkey == FULL_MGMT_P_KEY)
return 0;
- /*
- * On OPA devices it is okay to lose the upper 16 bits of LID as this
- * information is obtained elsewhere. Mask off the upper 16 bits.
- */
- ingress_pkey_table_fail(ppd, pkey, ib_lid_cpu16(0xFFFF & in_wc->slid));
+ ingress_pkey_table_fail(ppd, pkey, in_wc->slid);
return 1;
}