diff mbox series

[ovs-dev,6/8] datapath: fix return type of ndo_start_xmit function

Message ID 1544036152-27247-7-git-send-email-gvrose8192@gmail.com
State Superseded
Headers show
Series datapath: Pull in upstream fixes and updates | expand

Commit Message

Gregory Rose Dec. 5, 2018, 6:55 p.m. UTC 
From: YueHaibing <yuehaibing@huawei.com>

Upstream commit:
    commit eddf11e18dff0e8671e06ce54e64cfc843303ab9
    Author: YueHaibing <yuehaibing@huawei.com>
    Date:   Wed Sep 26 17:15:38 2018 +0800

    net: ovs: fix return type of ndo_start_xmit function

    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: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

CC: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 datapath/vport-internal_dev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

William Tu Dec. 10, 2018, 6 p.m. UTC | #1 
On Wed, Dec 5, 2018 at 10:56 AM Greg Rose <gvrose8192@gmail.com> wrote:
>
> From: YueHaibing <yuehaibing@huawei.com>
>
> Upstream commit:
>     commit eddf11e18dff0e8671e06ce54e64cfc843303ab9
>     Author: YueHaibing <yuehaibing@huawei.com>
>     Date:   Wed Sep 26 17:15:38 2018 +0800
>
>     net: ovs: fix return type of ndo_start_xmit function
>
>     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: YueHaibing <yuehaibing@huawei.com>
>     Signed-off-by: David S. Miller <davem@davemloft.net>
>
> CC: YueHaibing <yuehaibing@huawei.com>
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> ---
LGTM.
Acked-by: William Tu <u9012063@gmail.com>
diff mbox series

Patch

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 629965e..0318f58 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -43,7 +43,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;
 
@@ -62,7 +63,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)