diff options
| author |   Jose Abreu <Jose.Abreu@synopsys.com> | 2018-04-16 16:08:12 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-16 18:49:26 -0400 |
| commit | 42de047d60bc5d87e369c36115058b9dacc5683c (patch) | |
| tree | 354798e2a00cdad25396c24b92a4c086a931fe82 /drivers/net/ethernet/stmicro/stmmac/norm_desc.c | |
| parent | Merge branch 'tcp-zero-copy-receive' (diff) | |
| download | linux-dev-42de047d60bc5d87e369c36115058b9dacc5683c.tar.xz linux-dev-42de047d60bc5d87e369c36115058b9dacc5683c.zip | |
net: stmmac: Switch stmmac_desc_ops to generic HW Interface Helpers
Switch stmmac_desc_ops to generic Hardware Interface Helpers instead of
using hard-coded callbacks. This makes the code more readable and more
flexible.
No functional change.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/norm_desc.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c index ebd9e5e00f16..7b1d901bf5bc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c +++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c @@ -253,7 +253,7 @@ static int ndesc_get_tx_timestamp_status(struct dma_desc *p) return (le32_to_cpu(p->des0) & TDES0_TIME_STAMP_STATUS) >> 17; } -static u64 ndesc_get_timestamp(void *desc, u32 ats) +static void ndesc_get_timestamp(void *desc, u32 ats, u64 *ts) { struct dma_desc *p = (struct dma_desc *)desc; u64 ns; @@ -262,7 +262,7 @@ static u64 ndesc_get_timestamp(void *desc, u32 ats) /* convert high/sec time stamp value to nanosecond */ ns += le32_to_cpu(p->des3) * 1000000000ULL; - return ns; + *ts = ns; } static int ndesc_get_rx_timestamp_status(void *desc, void *next_desc, u32 ats) |