diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
| commit | 7622d4905a038961da6b1c6c3fe4be6c3dad7ef9 (patch) | |
| tree | cce9f4bc0ef2de31cee8e06e2cd6358dd51fa9c5 /drivers/net/ethernet/stmicro/stmmac/stmmac.h | |
| parent | 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.tar.xz | |
Merge tag 'v3.17-rc5' from upstream
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac.h')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index ca01035634a7..58097c0e2ad5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -34,6 +34,11 @@ #include <linux/ptp_clock_kernel.h> #include <linux/reset.h> +struct stmmac_tx_info { + dma_addr_t buf; + bool map_as_page; +}; + struct stmmac_priv { /* Frequently used values are kept adjacent for cache effect */ struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp; @@ -45,7 +50,7 @@ struct stmmac_priv { u32 tx_count_frames; u32 tx_coal_frames; u32 tx_coal_timer; - dma_addr_t *tx_skbuff_dma; + struct stmmac_tx_info *tx_skbuff_dma; dma_addr_t dma_tx_phy; int tx_coalesce; int hwts_tx_en; @@ -105,6 +110,8 @@ struct stmmac_priv { struct ptp_clock *ptp_clock; struct ptp_clock_info ptp_clock_ops; unsigned int default_addend; + struct clk *clk_ptp_ref; + unsigned int clk_ptp_rate; u32 adv_ts; int use_riwt; int irq_wake; |