projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[linux-2.6-microblaze.git]
/
drivers
/
infiniband
/
hw
/
bnxt_re
/
ib_verbs.c
diff --git
a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index
3048862
..
408dfbc
100644
(file)
--- a/
drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/
drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@
-1309,7
+1309,7
@@
out:
static int bnxt_re_create_shadow_gsi(struct bnxt_re_qp *qp,
struct bnxt_re_pd *pd)
{
static int bnxt_re_create_shadow_gsi(struct bnxt_re_qp *qp,
struct bnxt_re_pd *pd)
{
- struct bnxt_re_sqp_entries *sqp_tbl
= NULL
;
+ struct bnxt_re_sqp_entries *sqp_tbl;
struct bnxt_re_dev *rdev;
struct bnxt_re_qp *sqp;
struct bnxt_re_ah *sah;
struct bnxt_re_dev *rdev;
struct bnxt_re_qp *sqp;
struct bnxt_re_ah *sah;
@@
-1317,7
+1317,7
@@
static int bnxt_re_create_shadow_gsi(struct bnxt_re_qp *qp,
rdev = qp->rdev;
/* Create a shadow QP to handle the QP1 traffic */
rdev = qp->rdev;
/* Create a shadow QP to handle the QP1 traffic */
- sqp_tbl = k
zalloc(sizeof(*sqp_tbl) * BNXT_RE_MAX_GSI_SQP_ENTRIES
,
+ sqp_tbl = k
calloc(BNXT_RE_MAX_GSI_SQP_ENTRIES, sizeof(*sqp_tbl)
,
GFP_KERNEL);
if (!sqp_tbl)
return -ENOMEM;
GFP_KERNEL);
if (!sqp_tbl)
return -ENOMEM;