projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/nau8824', 'asoc/topic/nau8825' and 'asoc...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
enh_desc.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index
7546b36
..
2a828a3
100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@
-400,7
+400,8
@@
static u64 enh_desc_get_timestamp(void *desc, u32 ats)
return ns;
}
-static int enh_desc_get_rx_timestamp_status(void *desc, u32 ats)
+static int enh_desc_get_rx_timestamp_status(void *desc, void *next_desc,
+ u32 ats)
{
if (ats) {
struct dma_extended_desc *p = (struct dma_extended_desc *)desc;