Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
0139fd7c
Commit
0139fd7c
authored
Jan 06, 2010
by
Roland Dreier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'misc' and 'mlx4' into for-next
parents
fd4582a3
b4f77264
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx4/qp.c
+1
-1
drivers/infiniband/hw/mlx4/srq.c
drivers/infiniband/hw/mlx4/srq.c
+6
-0
drivers/net/mlx4/main.c
drivers/net/mlx4/main.c
+1
-1
No files found.
drivers/infiniband/hw/mlx4/qp.c
View file @
0139fd7c
...
...
@@ -1752,7 +1752,7 @@ int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
ind
=
qp
->
rq
.
head
&
(
qp
->
rq
.
wqe_cnt
-
1
);
for
(
nreq
=
0
;
wr
;
++
nreq
,
wr
=
wr
->
next
)
{
if
(
mlx4_wq_overflow
(
&
qp
->
rq
,
nreq
,
qp
->
ibqp
.
send
_cq
))
{
if
(
mlx4_wq_overflow
(
&
qp
->
rq
,
nreq
,
qp
->
ibqp
.
recv
_cq
))
{
err
=
-
ENOMEM
;
*
bad_wr
=
wr
;
goto
out
;
...
...
drivers/infiniband/hw/mlx4/srq.c
View file @
0139fd7c
...
...
@@ -74,6 +74,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
struct
mlx4_ib_dev
*
dev
=
to_mdev
(
pd
->
device
);
struct
mlx4_ib_srq
*
srq
;
struct
mlx4_wqe_srq_next_seg
*
next
;
struct
mlx4_wqe_data_seg
*
scatter
;
int
desc_size
;
int
buf_size
;
int
err
;
...
...
@@ -149,6 +150,11 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
next
=
get_wqe
(
srq
,
i
);
next
->
next_wqe_index
=
cpu_to_be16
((
i
+
1
)
&
(
srq
->
msrq
.
max
-
1
));
for
(
scatter
=
(
void
*
)
(
next
+
1
);
(
void
*
)
scatter
<
(
void
*
)
next
+
desc_size
;
++
scatter
)
scatter
->
lkey
=
cpu_to_be32
(
MLX4_INVALID_LKEY
);
}
err
=
mlx4_mtt_init
(
dev
->
dev
,
srq
->
buf
.
npages
,
srq
->
buf
.
page_shift
,
...
...
drivers/net/mlx4/main.c
View file @
0139fd7c
...
...
@@ -1174,7 +1174,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return
0
;
err_port:
for
(
port
=
1
;
port
<=
dev
->
caps
.
num_ports
;
port
++
)
for
(
--
port
;
port
>=
1
;
--
port
)
mlx4_cleanup_port_info
(
&
priv
->
port
[
port
]);
mlx4_cleanup_mcg_table
(
dev
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment