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
bb77c03c
Commit
bb77c03c
authored
Oct 04, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
parents
ce12467d
aba7a22f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
26 deletions
+23
-26
drivers/infiniband/hw/mthca/mthca_main.c
drivers/infiniband/hw/mthca/mthca_main.c
+21
-24
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
+2
-2
No files found.
drivers/infiniband/hw/mthca/mthca_main.c
View file @
bb77c03c
...
...
@@ -503,6 +503,25 @@ err_free_aux:
return
err
;
}
static
void
mthca_free_icms
(
struct
mthca_dev
*
mdev
)
{
u8
status
;
mthca_free_icm_table
(
mdev
,
mdev
->
mcg_table
.
table
);
if
(
mdev
->
mthca_flags
&
MTHCA_FLAG_SRQ
)
mthca_free_icm_table
(
mdev
,
mdev
->
srq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
cq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
rdb_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
eqp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
qp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mpt_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mtt_table
);
mthca_unmap_eq_icm
(
mdev
);
mthca_UNMAP_ICM_AUX
(
mdev
,
&
status
);
mthca_free_icm
(
mdev
,
mdev
->
fw
.
arbel
.
aux_icm
);
}
static
int
__devinit
mthca_init_arbel
(
struct
mthca_dev
*
mdev
)
{
struct
mthca_dev_lim
dev_lim
;
...
...
@@ -580,18 +599,7 @@ static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
return
0
;
err_free_icm:
if
(
mdev
->
mthca_flags
&
MTHCA_FLAG_SRQ
)
mthca_free_icm_table
(
mdev
,
mdev
->
srq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
cq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
rdb_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
eqp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
qp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mpt_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mtt_table
);
mthca_unmap_eq_icm
(
mdev
);
mthca_UNMAP_ICM_AUX
(
mdev
,
&
status
);
mthca_free_icm
(
mdev
,
mdev
->
fw
.
arbel
.
aux_icm
);
mthca_free_icms
(
mdev
);
err_stop_fw:
mthca_UNMAP_FA
(
mdev
,
&
status
);
...
...
@@ -611,18 +619,7 @@ static void mthca_close_hca(struct mthca_dev *mdev)
mthca_CLOSE_HCA
(
mdev
,
0
,
&
status
);
if
(
mthca_is_memfree
(
mdev
))
{
if
(
mdev
->
mthca_flags
&
MTHCA_FLAG_SRQ
)
mthca_free_icm_table
(
mdev
,
mdev
->
srq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
cq_table
.
table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
rdb_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
eqp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
qp_table
.
qp_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mpt_table
);
mthca_free_icm_table
(
mdev
,
mdev
->
mr_table
.
mtt_table
);
mthca_unmap_eq_icm
(
mdev
);
mthca_UNMAP_ICM_AUX
(
mdev
,
&
status
);
mthca_free_icm
(
mdev
,
mdev
->
fw
.
arbel
.
aux_icm
);
mthca_free_icms
(
mdev
);
mthca_UNMAP_FA
(
mdev
,
&
status
);
mthca_free_icm
(
mdev
,
mdev
->
fw
.
arbel
.
fw_icm
);
...
...
drivers/infiniband/ulp/ipoib/ipoib_main.c
View file @
bb77c03c
...
...
@@ -474,7 +474,7 @@ err:
spin_unlock
(
&
priv
->
lock
);
}
static
void
path_lookup
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
static
void
ipoib_
path_lookup
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
{
struct
ipoib_dev_priv
*
priv
=
netdev_priv
(
skb
->
dev
);
...
...
@@ -569,7 +569,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
if
(
skb
->
dst
&&
skb
->
dst
->
neighbour
)
{
if
(
unlikely
(
!*
to_ipoib_neigh
(
skb
->
dst
->
neighbour
)))
{
path_lookup
(
skb
,
dev
);
ipoib_
path_lookup
(
skb
,
dev
);
goto
out
;
}
...
...
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