diff mbox

mptlan: fix mpt_lan_sdu_send()'s return type

Message ID 20180424131558.3010-1-luc.vanoostenryck@gmail.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Luc Van Oostenryck April 24, 2018, 1:15 p.m. UTC
The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 drivers/message/fusion/mptlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin K. Petersen May 8, 2018, 5:21 a.m. UTC | #1
Luc,

> The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
> which is a typedef for an enum type, but the implementation in this
> driver returns an 'int'.

You forgot to update the function prototype accordingly.
Luc Van Oostenryck May 8, 2018, 3:44 p.m. UTC | #2
On Tue, May 08, 2018 at 01:21:56AM -0400, Martin K. Petersen wrote:
> 
> Luc,
> 
> > The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
> > which is a typedef for an enum type, but the implementation in this
> > driver returns an 'int'.
> 
> You forgot to update the function prototype accordingly.

Hmmm, the function mpt_lan_sdu_send() has no other declaration
than the one I modified the return type in this patch.

Must be a misunderstanding somewhere.

-- Luc
Martin K. Petersen May 15, 2018, 2:51 a.m. UTC | #3
Luc,

>> You forgot to update the function prototype accordingly.
>
> Hmmm, the function mpt_lan_sdu_send() has no other declaration
> than the one I modified the return type in this patch.
>
> Must be a misunderstanding somewhere.

My bad, I thought you were updating mpt_lan_send_reply().

Applied to 4.18/scsi-queue.
diff mbox

Patch

diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 55dd71bbd..4cbed4d06 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -670,7 +670,7 @@  mpt_lan_send_reply(struct net_device *dev, LANSendReply_t *pSendRep)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-static int
+static netdev_tx_t
 mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
 {
 	struct mpt_lan_priv *priv = netdev_priv(dev);