2018-04-24 14:58:01

by Luc Van Oostenryck

Subject: [PATCH] openvswitch: fix internal_dev_xmit()'s return type

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 <[email protected]>
---
net/openvswitch/vport-internal_dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index bb95c43aa..3ea55618e 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -43,7 +43,7 @@ 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;

--
2.17.0

2018-05-07 20:44:25

by Gregory Rose

Subject: Re: [ovs-dev] [PATCH] openvswitch: fix internal_dev_xmit()'s return type

On 4/24/2018 6:17 AM, Luc Van Oostenryck wrote:
> 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 <[email protected]>
> ---
> net/openvswitch/vport-internal_dev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
> index bb95c43aa..3ea55618e 100644
> --- a/net/openvswitch/vport-internal_dev.c
> +++ b/net/openvswitch/vport-internal_dev.c
> @@ -43,7 +43,7 @@ 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;
>

LGTM

Reviewed-by: Greg Rose <[email protected]>