]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: hns3: fix return type of ndo_start_xmit function
authorYueHaibing <yuehaibing@huawei.com>
Tue, 18 Sep 2018 06:09:43 +0000 (14:09 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:16:40 +0000 (13:16 +0100)
BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit c9c3941186c5637caed131c4f4064411d6882299 ]

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, also the implementation in this
driver has returns 'netdev_tx_t' value, so just 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/ethernet/hisilicon/hip04_eth.c
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

index d09ceb30d8aafb7aaa02a766ffba171480486a55..8c5f99c1c084ebf6ed6b29993428b8c8dfb72a4b 100644 (file)
@@ -424,7 +424,8 @@ static void hip04_start_tx_timer(struct hip04_priv *priv)
                               ns, HRTIMER_MODE_REL);
 }
 
-static int hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+static netdev_tx_t
+hip04_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
        struct hip04_priv *priv = netdev_priv(ndev);
        struct net_device_stats *stats = &ndev->stats;
index 25a6c8722ecacc981ff8320276c3b41943e8fa31..aab6fb10af94a3842541e8b5d15a14efedf6d1fc 100644 (file)
@@ -736,7 +736,7 @@ static int hix5hd2_fill_sg_desc(struct hix5hd2_priv *priv,
        return 0;
 }
 
-static int hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t hix5hd2_net_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct hix5hd2_priv *priv = netdev_priv(dev);
        struct hix5hd2_desc *desc;