kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IB/rxe: remove redudant qpn check

Browse source 
In the commit 536ca245c5 ("IB/rxe: Drop QP0 silently"), if qpn is
zero, the function directly returns. So in the following function,
it is not necessary to check qpn. The qpn check in the function
check_keys is removed.

Fixes: 536ca245c5 ("IB/rxe: Drop QP0 silently")
CC: Srinivas Eeda <srinivas.eeda@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Zhu Yanjun 2018-08-19 15:04:01 +08:00 committed by Doug Ledford
parent d3c04a3a68
commit 8b7b59d030
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/infiniband/sw/rxe/rxe_recv.c
View file

@ -122,7 +122,7 @@ static int check_keys(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
set_bad_pkey_cntr(port); set_bad_pkey_cntr(port);
goto err1; goto err1;
} }
} else if (qpn != 0) { } else {
if (unlikely(!pkey_match(pkey, if (unlikely(!pkey_match(pkey,
port->pkey_tbl[qp->attr.pkey_index] port->pkey_tbl[qp->attr.pkey_index]
))) { ))) {
@ -134,7 +134,7 @@ static int check_keys(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
} }
if ((qp_type(qp) == IB_QPT_UD || qp_type(qp) == IB_QPT_GSI) && if ((qp_type(qp) == IB_QPT_UD || qp_type(qp) == IB_QPT_GSI) &&
qpn != 0 && pkt->mask) { pkt->mask) {
u32 qkey = (qpn == 1) ? GSI_QKEY : qp->attr.qkey; u32 qkey = (qpn == 1) ? GSI_QKEY : qp->attr.qkey;
if (unlikely(deth_qkey(pkt) != qkey)) { if (unlikely(deth_qkey(pkt) != qkey)) {