diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
| commit | 8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch) | |
| tree | 58b31d3d9514df93974216f190824d73f9816d9f /drivers/net/ethernet/altera/altera_msgdma.c | |
| parent | 263c08af44741697202b85e631a964ee85200eb0 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
| download | talos-op-linux-8320857b1d168fd17d7cee48bbfd04aaf6797be8.tar.gz talos-op-linux-8320857b1d168fd17d7cee48bbfd04aaf6797be8.zip | |
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'drivers/net/ethernet/altera/altera_msgdma.c')
| -rw-r--r-- | drivers/net/ethernet/altera/altera_msgdma.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/altera/altera_msgdma.c b/drivers/net/ethernet/altera/altera_msgdma.c index 3df18669ea30..4d1f2fdd5c32 100644 --- a/drivers/net/ethernet/altera/altera_msgdma.c +++ b/drivers/net/ethernet/altera/altera_msgdma.c @@ -18,6 +18,7 @@ #include "altera_utils.h" #include "altera_tse.h" #include "altera_msgdmahw.h" +#include "altera_msgdma.h" /* No initialization work to do for MSGDMA */ int msgdma_initialize(struct altera_tse_private *priv) @@ -29,6 +30,10 @@ void msgdma_uninitialize(struct altera_tse_private *priv) { } +void msgdma_start_rxdma(struct altera_tse_private *priv) +{ +} + void msgdma_reset(struct altera_tse_private *priv) { int counter; @@ -154,7 +159,7 @@ u32 msgdma_tx_completions(struct altera_tse_private *priv) /* Put buffer to the mSGDMA RX FIFO */ -int msgdma_add_rx_desc(struct altera_tse_private *priv, +void msgdma_add_rx_desc(struct altera_tse_private *priv, struct tse_buffer *rxbuffer) { struct msgdma_extended_desc *desc = priv->rx_dma_desc; @@ -175,7 +180,6 @@ int msgdma_add_rx_desc(struct altera_tse_private *priv, iowrite32(0, &desc->burst_seq_num); iowrite32(0x00010001, &desc->stride); iowrite32(control, &desc->control); - return 1; } /* status is returned on upper 16 bits, |
