Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
78703894
Commit
78703894
authored
Feb 04, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
parents
005c79b3
b98ac702
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
drivers/net/cxgb3/sge.c
drivers/net/cxgb3/sge.c
+1
-2
drivers/net/gianfar.c
drivers/net/gianfar.c
+3
-0
drivers/net/gianfar.h
drivers/net/gianfar.h
+1
-1
No files found.
drivers/net/cxgb3/sge.c
View file @
78703894
...
@@ -2201,8 +2201,7 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
...
@@ -2201,8 +2201,7 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
}
else
if
((
len
=
ntohl
(
r
->
len_cq
))
!=
0
)
{
}
else
if
((
len
=
ntohl
(
r
->
len_cq
))
!=
0
)
{
struct
sge_fl
*
fl
;
struct
sge_fl
*
fl
;
if
(
eth
)
lro
&=
eth
&&
is_eth_tcp
(
rss_hi
);
lro
=
qs
->
lro_enabled
&&
is_eth_tcp
(
rss_hi
);
fl
=
(
len
&
F_RSPD_FLQ
)
?
&
qs
->
fl
[
1
]
:
&
qs
->
fl
[
0
];
fl
=
(
len
&
F_RSPD_FLQ
)
?
&
qs
->
fl
[
1
]
:
&
qs
->
fl
[
0
];
if
(
fl
->
use_pages
)
{
if
(
fl
->
use_pages
)
{
...
...
drivers/net/gianfar.c
View file @
78703894
...
@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev,
...
@@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev,
/* Reset MAC layer */
/* Reset MAC layer */
gfar_write
(
&
priv
->
regs
->
maccfg1
,
MACCFG1_SOFT_RESET
);
gfar_write
(
&
priv
->
regs
->
maccfg1
,
MACCFG1_SOFT_RESET
);
/* We need to delay at least 3 TX clocks */
udelay
(
2
);
tempval
=
(
MACCFG1_TX_FLOW
|
MACCFG1_RX_FLOW
);
tempval
=
(
MACCFG1_TX_FLOW
|
MACCFG1_RX_FLOW
);
gfar_write
(
&
priv
->
regs
->
maccfg1
,
tempval
);
gfar_write
(
&
priv
->
regs
->
maccfg1
,
tempval
);
...
...
drivers/net/gianfar.h
View file @
78703894
...
@@ -314,7 +314,7 @@ extern const char gfar_driver_version[];
...
@@ -314,7 +314,7 @@ extern const char gfar_driver_version[];
#define ATTRELI_EI(x) (x)
#define ATTRELI_EI(x) (x)
#define BD_LFLAG(flags) ((flags) << 16)
#define BD_LFLAG(flags) ((flags) << 16)
#define BD_LENGTH_MASK 0x00ff
#define BD_LENGTH_MASK 0x00
00ff
ff
/* TxBD status field bits */
/* TxBD status field bits */
#define TXBD_READY 0x8000
#define TXBD_READY 0x8000
...
...
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