Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c33279d authored by YueHaibing's avatar YueHaibing Committed by Greg Kroah-Hartman
Browse files

net: faraday: fix return type of ndo_start_xmit function 



[ Upstream commit 0a715156656bddf4aa92d9868f850aeeb0465fd0 ]

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, so make sure the implementation in
this driver has returns 'netdev_tx_t' value, and change the function
return type to netdev_tx_t.

Found by coccinelle.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent da494741

drivers/net/ethernet/faraday/ftgmac100.c

+2 −2
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static bool ftgmac100_prep_tx_csum(struct sk_buff *skb, u32 *csum_vlan) 
	return skb_checksum_help(skb) == 0;

}



static int ftgmac100_hard_start_xmit(struct sk_buff *skb,

static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,

					     struct net_device *netdev)

{

	struct ftgmac100 *priv = netdev_priv(netdev);

drivers/net/ethernet/faraday/ftmac100.c

+4 −3
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void ftmac100_tx_complete(struct ftmac100 *priv) 
		;

}



static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,

static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,

				 dma_addr_t map)

{

	struct net_device *netdev = priv->netdev;
@@ -1013,7 +1013,8 @@ static int ftmac100_stop(struct net_device *netdev) 
	return 0;

}



static int ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t

ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)

{

	struct ftmac100 *priv = netdev_priv(netdev);

	dma_addr_t map;