From a8c4a79264b690465b859495cfb42d41d0283264 Mon Sep 17 00:00:00 2001 From: Intiyaz Basha Date: Fri, 23 Mar 2018 17:37:25 -0700 Subject: liquidio: Removed start_txq function Removing start_txq function from VF and PF files Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas Signed-off-by: David S. Miller --- 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(-) (limited to 'drivers/net/ethernet/cavium/liquidio') diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index c0df7be6e0c1..424795a3a6d1 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -513,20 +513,6 @@ static void liquidio_deinit_pci(void) pci_unregister_driver(&liquidio_pci_driver); } -/** - * \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 @@ -2145,7 +2131,7 @@ static int liquidio_open(struct net_device *netdev) return -1; } - start_txq(netdev); + txqs_start(netdev); /* tell Octeon to start forwarding packets to host */ send_rx_ctrl_cmd(lio, 1); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 5f0114d9c881..57b6ee578210 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -284,20 +284,6 @@ static struct pci_driver liquidio_vf_pci_driver = { .err_handler = &liquidio_vf_err_handler, /* For AER */ }; -/** - * \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 @@ -1189,7 +1175,7 @@ static int liquidio_open(struct net_device *netdev) 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); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h index cd334a74a275..72a581aaa320 100644 --- 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_device *netdev) */ 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); + } } } -- cgit v1.2.3-59-g8ed1b