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

Commit 53532b08 authored by YueHaibing's avatar YueHaibing Committed by Greg Kroah-Hartman
Browse files

net: micrel: fix return type of ndo_start_xmit function 



[ Upstream commit 2b49117a5abee8478b0470cba46ac74f93b4a479 ]

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 700feda3

drivers/net/ethernet/micrel/ks8695net.c

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ ks8695_timeout(struct net_device *ndev) 
 *	sk_buff and adds it to the TX ring. It then kicks the TX DMA

 *	engine to ensure transmission begins.

 */

static int

static netdev_tx_t

ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	struct ks8695_priv *ksp = netdev_priv(ndev);

drivers/net/ethernet/micrel/ks8851_mll.c

+2 −2
Original line number Diff line number Diff line
@@ -1020,9 +1020,9 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) 
 * spin_lock_irqsave is required because tx and rx should be mutual exclusive.

 * So while tx is in-progress, prevent IRQ interrupt from happenning.

 */

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

static netdev_tx_t ks_start_xmit(struct sk_buff *skb, struct net_device *netdev)

{

	int retv = NETDEV_TX_OK;

	netdev_tx_t retv = NETDEV_TX_OK;

	struct ks_net *ks = netdev_priv(netdev);



	disable_irq(netdev->irq);