From: Intiyaz Basha <intiyaz.basha@cavium.com>
Date: Fri, 23 Mar 2018 17:37:25 -0700
Subject: liquidio: Removed start_txq function
Patch-mainline: v4.17-rc1
Git-commit: a8c4a79264b690465b859495cfb42d41d0283264
References: bsc#1119406 FATE#326562
Removing start_txq function from VF and PF files
Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com>
Acked-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/cavium/liquidio/lio_main.c | 16 +---------------
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 16 +---------------
drivers/net/ethernet/cavium/liquidio/octeon_network.h | 16 ++++++++++------
3 files changed, 12 insertions(+), 36 deletions(-)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -514,20 +514,6 @@ static void liquidio_deinit_pci(void)
}
/**
- * \brief Start Tx queue
- * @param netdev network device
- */
-static void start_txq(struct net_device *netdev)
-{
- struct lio *lio = GET_LIO(netdev);
-
- if (lio->linfo.link.s.link_up) {
- txqs_start(netdev);
- return;
- }
-}
-
-/**
* \brief Wake a queue
* @param netdev network device
* @param q which queue to wake
@@ -2145,7 +2131,7 @@ static int liquidio_open(struct net_devi
return -1;
}
- start_txq(netdev);
+ txqs_start(netdev);
/* tell Octeon to start forwarding packets to host */
send_rx_ctrl_cmd(lio, 1);
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -285,20 +285,6 @@ static struct pci_driver liquidio_vf_pci
};
/**
- * \brief Start Tx queue
- * @param netdev network device
- */
-static void start_txq(struct net_device *netdev)
-{
- struct lio *lio = GET_LIO(netdev);
-
- if (lio->linfo.link.s.link_up) {
- txqs_start(netdev);
- return;
- }
-}
-
-/**
* \brief Wake a queue
* @param netdev network device
* @param q which queue to wake
@@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_devi
lio->intf_open = 1;
netif_info(lio, ifup, lio->netdev, "Interface Open, ready for traffic\n");
- start_txq(netdev);
+ txqs_start(netdev);
/* tell Octeon to start forwarding packets to host */
send_rx_ctrl_cmd(lio, 1);
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -556,13 +556,17 @@ static inline void txqs_wake(struct net_
*/
static inline void txqs_start(struct net_device *netdev)
{
- if (netif_is_multiqueue(netdev)) {
- int i;
+ struct lio *lio = GET_LIO(netdev);
- for (i = 0; i < netdev->num_tx_queues; i++)
- netif_start_subqueue(netdev, i);
- } else {
- netif_start_queue(netdev);
+ if (lio->linfo.link.s.link_up) {
+ if (netif_is_multiqueue(netdev)) {
+ int i;
+
+ for (i = 0; i < netdev->num_tx_queues; i++)
+ netif_start_subqueue(netdev, i);
+ } else {
+ netif_start_queue(netdev);
+ }
}
}