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

Commit 1a7704e7 authored by YueHaibing's avatar YueHaibing Committed by Greg Kroah-Hartman
Browse files

net: ovs: fix return type of ndo_start_xmit function 



[ Upstream commit eddf11e18dff0e8671e06ce54e64cfc843303ab9 ]

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 31941e54

net/openvswitch/vport-internal_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev) 
}



/* Called with rcu_read_lock_bh. */

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

static netdev_tx_t

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

{

	int len, err;
@@ -63,7 +64,7 @@ static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) 
	} else {

		netdev->stats.tx_errors++;

	}

	return 0;

	return NETDEV_TX_OK;

}



static int internal_dev_open(struct net_device *netdev)