git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
dwmac4_descs.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index 736e29635b7729d0d53f85d1634c5a4c45fdfa18..7fbb6a4dbf5107723f16b825e7a3b1577c97254a 100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@
-271,7
+271,7
@@
static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc,
int ret = -EINVAL;
/* Get the status from normal w/b descriptor */
- if (likely(
p->des3 & TDES3_RS1V
)) {
+ if (likely(
le32_to_cpu(p->des3) & RDES3_RDES1_VALID
)) {
if (likely(le32_to_cpu(p->des1) & RDES1_TIMESTAMP_AVAILABLE)) {
int i = 0;