From 644d8c5f24f668c9e74923cd9da0d338dd9b9096 Mon Sep 17 00:00:00 2001 From: Bibhay Ranjan Date: Wed, 3 Nov 2021 18:17:03 +0530 Subject: [PATCH] nvethernet: Update the osd_dma_ops definition Issue: qnx and linux uses the same definition in nvethernetrm. qnx definitions needs to be changed as per MISRA guidelines which will cause mismatch in function definition in linux Fix: Update the definitions in linux as per declaration in nvethernetrm Bug 200770325 Change-Id: Ic9f209a9748780176a7ca6abd1f84f8a31cd321d Signed-off-by: Bibhay Ranjan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2620813 Reviewed-by: svcacv Reviewed-by: Rakesh Goyal Reviewed-by: Ashutosh Jha Reviewed-by: svc_kernel_abi Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/osd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/osd.c b/drivers/net/ethernet/nvidia/nvethernet/osd.c index 55c9b2de..de3f4b32 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/osd.c +++ b/drivers/net/ethernet/nvidia/nvethernet/osd.c @@ -539,7 +539,7 @@ exit: */ void osd_receive_packet(void *priv, struct osi_rx_ring *rx_ring, unsigned int chan, unsigned int dma_buf_len, - struct osi_rx_pkt_cx *rx_pkt_cx, + const struct osi_rx_pkt_cx *rx_pkt_cx, struct osi_rx_swcx *rx_swcx) { struct ether_priv_data *pdata = (struct ether_priv_data *)priv; @@ -693,7 +693,8 @@ static inline unsigned int ether_get_free_tx_ts_node(struct ether_priv_data *pda */ static void osd_transmit_complete(void *priv, void *buffer, unsigned long dmaaddr, unsigned int len, - struct osi_txdone_pkt_cx *txdone_pkt_cx) + const struct osi_txdone_pkt_cx + *txdone_pkt_cx) { struct ether_priv_data *pdata = (struct ether_priv_data *)priv; struct osi_dma_priv_data *osi_dma = pdata->osi_dma;