| From 5e3773a96acb515a3b471af3dc19b626219d1354 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 Sep 2018 14:19:05 +0800 |
| Subject: net: cavium: fix return type of ndo_start_xmit function |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit ac1172dea10b6ba51de9346d3130db688b5196c5 ] |
| |
| 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/cavium/liquidio/lio_main.c | 2 +- |
| drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- |
| drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 5 +++-- |
| drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +++-- |
| 4 files changed, 8 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c |
| index 6fb13fa73b271..304e4b9436276 100644 |
| --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c |
| +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c |
| @@ -2324,7 +2324,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct, |
| * @returns whether the packet was transmitted to the device okay or not |
| * (NETDEV_TX_OK or NETDEV_TX_BUSY) |
| */ |
| -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) |
| +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) |
| { |
| struct lio *lio; |
| struct octnet_buf_free_info *finfo; |
| diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |
| index b77835724dc84..d83773bc0dd7f 100644 |
| --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |
| +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |
| @@ -1390,7 +1390,7 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct, |
| * @returns whether the packet was transmitted to the device okay or not |
| * (NETDEV_TX_OK or NETDEV_TX_BUSY) |
| */ |
| -static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) |
| +static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) |
| { |
| struct octnet_buf_free_info *finfo; |
| union octnic_cmd_setup cmdsetup; |
| diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c |
| index c99b59fe4c8fb..a1bda1683ebfc 100644 |
| --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c |
| +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c |
| @@ -31,7 +31,8 @@ |
| |
| static int lio_vf_rep_open(struct net_device *ndev); |
| static int lio_vf_rep_stop(struct net_device *ndev); |
| -static int lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev); |
| +static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb, |
| + struct net_device *ndev); |
| static void lio_vf_rep_tx_timeout(struct net_device *netdev); |
| static int lio_vf_rep_phys_port_name(struct net_device *dev, |
| char *buf, size_t len); |
| @@ -382,7 +383,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, |
| netif_wake_queue(ndev); |
| } |
| |
| -static int |
| +static netdev_tx_t |
| lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev) |
| { |
| struct lio_vf_rep_desc *vf_rep = netdev_priv(ndev); |
| diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c |
| index 592fb9e847b95..0957e735cdc4d 100644 |
| --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c |
| +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c |
| @@ -1268,12 +1268,13 @@ static int octeon_mgmt_stop(struct net_device *netdev) |
| return 0; |
| } |
| |
| -static int octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev) |
| +static netdev_tx_t |
| +octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev) |
| { |
| struct octeon_mgmt *p = netdev_priv(netdev); |
| union mgmt_port_ring_entry re; |
| unsigned long flags; |
| - int rv = NETDEV_TX_BUSY; |
| + netdev_tx_t rv = NETDEV_TX_BUSY; |
| |
| re.d64 = 0; |
| re.s.tstamp = ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) != 0); |
| -- |
| 2.20.1 |
| |