| From 786748be3fc491b821dcfa2134e6d5f6f2211f24 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 Sep 2018 14:35:47 +0800 |
| Subject: net: ibm: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 94b2bb28dbb43fcb943d5275ab19fd5a4972bedb ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- |
| drivers/net/ethernet/ibm/emac/core.c | 7 ++++--- |
| drivers/net/ethernet/ibm/ibmvnic.c | 4 ++-- |
| 3 files changed, 7 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c |
| index 506f78322d741..e8ee69d4e4d34 100644 |
| --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c |
| +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c |
| @@ -2027,7 +2027,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, |
| dev_consume_skb_any(skb); |
| } |
| |
| -static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| +static netdev_tx_t ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| { |
| struct ehea_port *port = netdev_priv(dev); |
| struct ehea_swqe *swqe; |
| diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c |
| index 129f4e9f38dac..a96f501813ff7 100644 |
| --- a/drivers/net/ethernet/ibm/emac/core.c |
| +++ b/drivers/net/ethernet/ibm/emac/core.c |
| @@ -1409,7 +1409,7 @@ static inline u16 emac_tx_csum(struct emac_instance *dev, |
| return 0; |
| } |
| |
| -static inline int emac_xmit_finish(struct emac_instance *dev, int len) |
| +static inline netdev_tx_t emac_xmit_finish(struct emac_instance *dev, int len) |
| { |
| struct emac_regs __iomem *p = dev->emacp; |
| struct net_device *ndev = dev->ndev; |
| @@ -1436,7 +1436,7 @@ static inline int emac_xmit_finish(struct emac_instance *dev, int len) |
| } |
| |
| /* Tx lock BH */ |
| -static int emac_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
| +static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
| { |
| struct emac_instance *dev = netdev_priv(ndev); |
| unsigned int len = skb->len; |
| @@ -1494,7 +1494,8 @@ static inline int emac_xmit_split(struct emac_instance *dev, int slot, |
| } |
| |
| /* Tx lock BH disabled (SG version for TAH equipped EMACs) */ |
| -static int emac_start_xmit_sg(struct sk_buff *skb, struct net_device *ndev) |
| +static netdev_tx_t |
| +emac_start_xmit_sg(struct sk_buff *skb, struct net_device *ndev) |
| { |
| struct emac_instance *dev = netdev_priv(ndev); |
| int nr_frags = skb_shinfo(skb)->nr_frags; |
| diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c |
| index 8fa14736449bc..8a1916443235a 100644 |
| --- a/drivers/net/ethernet/ibm/ibmvnic.c |
| +++ b/drivers/net/ethernet/ibm/ibmvnic.c |
| @@ -1420,7 +1420,7 @@ static int ibmvnic_xmit_workarounds(struct sk_buff *skb, |
| return 0; |
| } |
| |
| -static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) |
| +static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) |
| { |
| struct ibmvnic_adapter *adapter = netdev_priv(netdev); |
| int queue_num = skb_get_queue_mapping(skb); |
| @@ -1444,7 +1444,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) |
| u64 *handle_array; |
| int index = 0; |
| u8 proto = 0; |
| - int ret = 0; |
| + netdev_tx_t ret = NETDEV_TX_OK; |
| |
| if (adapter->resetting) { |
| if (!netif_subqueue_stopped(netdev, skb)) |
| -- |
| 2.20.1 |
| |