From: Matthew Gerlach <[email protected]> commit 695a9721aa52ec6039f3451d5091990921c61bd4 from https://github.com/altera-fpga/linux-socfpga socfpga-6.12.33-lts branch.
Fix day one compilation warning for enum vs. int mismatch. Signed-off-by: Matthew Gerlach <[email protected]> Signed-off-by: Liyin Zhang <[email protected]> --- drivers/net/ethernet/altera/altera_eth_dma.h | 4 ++-- drivers/net/ethernet/altera/altera_msgdma_prefetcher.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/altera/altera_eth_dma.h b/drivers/net/ethernet/altera/altera_eth_dma.h index c231d95c7417..a847b57ffeb4 100644 --- a/drivers/net/ethernet/altera/altera_eth_dma.h +++ b/drivers/net/ethernet/altera/altera_eth_dma.h @@ -119,8 +119,8 @@ struct altera_dmaops { void (*disable_rxirq)(struct altera_dma_private *priv); void (*clear_txirq)(struct altera_dma_private *priv); void (*clear_rxirq)(struct altera_dma_private *priv); - int (*tx_buffer)(struct altera_dma_private *priv, - struct altera_dma_buffer *buffer); + netdev_tx_t (*tx_buffer)(struct altera_dma_private *priv, + struct altera_dma_buffer *buffer); u32 (*tx_completions)(struct altera_dma_private *priv); void (*add_rx_desc)(struct altera_dma_private *priv, struct altera_dma_buffer *buffer); diff --git a/drivers/net/ethernet/altera/altera_msgdma_prefetcher.h b/drivers/net/ethernet/altera/altera_msgdma_prefetcher.h index 5b634f3f90e4..e7bbcac4e018 100644 --- a/drivers/net/ethernet/altera/altera_msgdma_prefetcher.h +++ b/drivers/net/ethernet/altera/altera_msgdma_prefetcher.h @@ -27,8 +27,8 @@ void msgdma_pref_clear_txirq(struct altera_dma_private *priv); u32 msgdma_pref_tx_completions(struct altera_dma_private *priv); void msgdma_pref_add_rx_desc(struct altera_dma_private *priv, struct altera_dma_buffer *buffer); -int msgdma_pref_tx_buffer(struct altera_dma_private *priv, - struct altera_dma_buffer *buffer); +netdev_tx_t msgdma_pref_tx_buffer(struct altera_dma_private *priv, + struct altera_dma_buffer *buffer); u32 msgdma_pref_rx_status(struct altera_dma_private *priv); int msgdma_pref_initialize(struct altera_dma_private *priv); void msgdma_pref_uninitialize(struct altera_dma_private *priv); -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16003): https://lists.yoctoproject.org/g/linux-yocto/message/16003 Mute This Topic: https://lists.yoctoproject.org/mt/116480400/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
