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

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

[Luc Van Oostenryck]

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

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

[Gregory Rose]

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 <luc.vanoostenryck@gmail.com>
> ---
>   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 <gvrose8192@gmail.com>