projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
jme.h
diff --git
a/drivers/net/ethernet/jme.h
b/drivers/net/ethernet/jme.h
index
4304072
..
3efc897
100644
(file)
--- a/
drivers/net/ethernet/jme.h
+++ b/
drivers/net/ethernet/jme.h
@@
-730,7
+730,7
@@
enum jme_rxcs_values {
RXCS_RETRYCNT_60 = 0x00000F00,
RXCS_DEFAULT = RXCS_FIFOTHTP_128T |
- RXCS_FIFOTHNP_1
28
QW |
+ RXCS_FIFOTHNP_1
6
QW |
RXCS_DMAREQSZ_128B |
RXCS_RETRYGAP_256ns |
RXCS_RETRYCNT_32,