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
7f168162
Commit
7f168162
authored
Mar 01, 2010
by
Roland Dreier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ipoib' into for-next
parents
85f938a7
757bebb3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+2
-8
No files found.
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
View file @
7f168162
...
...
@@ -55,9 +55,7 @@ static int ipoib_get_coalesce(struct net_device *dev,
struct
ipoib_dev_priv
*
priv
=
netdev_priv
(
dev
);
coal
->
rx_coalesce_usecs
=
priv
->
ethtool
.
coalesce_usecs
;
coal
->
tx_coalesce_usecs
=
priv
->
ethtool
.
coalesce_usecs
;
coal
->
rx_max_coalesced_frames
=
priv
->
ethtool
.
max_coalesced_frames
;
coal
->
tx_max_coalesced_frames
=
priv
->
ethtool
.
max_coalesced_frames
;
return
0
;
}
...
...
@@ -69,10 +67,8 @@ static int ipoib_set_coalesce(struct net_device *dev,
int
ret
;
/*
* Since IPoIB uses a single CQ for both rx and tx, we assume
* that rx params dictate the configuration. These values are
* saved in the private data and returned when ipoib_get_coalesce()
* is called.
* These values are saved in the private data and returned
* when ipoib_get_coalesce() is called
*/
if
(
coal
->
rx_coalesce_usecs
>
0xffff
||
coal
->
rx_max_coalesced_frames
>
0xffff
)
...
...
@@ -85,8 +81,6 @@ static int ipoib_set_coalesce(struct net_device *dev,
return
ret
;
}
coal
->
tx_coalesce_usecs
=
coal
->
rx_coalesce_usecs
;
coal
->
tx_max_coalesced_frames
=
coal
->
rx_max_coalesced_frames
;
priv
->
ethtool
.
coalesce_usecs
=
coal
->
rx_coalesce_usecs
;
priv
->
ethtool
.
max_coalesced_frames
=
coal
->
rx_max_coalesced_frames
;
...
...
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