From: Intiyaz Basha <intiyaz.ba...@cavium.com>

Moving common function txqs_start to octeon_network.h

Signed-off-by: Intiyaz Basha <intiyaz.ba...@cavium.com>
Acked-by: Derek Chickles <derek.chick...@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlu...@cavium.com>
---
 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 | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 089f494..8e280c5 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -509,22 +509,6 @@ static void liquidio_deinit_pci(void)
 }
 
 /**
- * \brief Start Tx queues
- * @param netdev network device
- */
-static inline void txqs_start(struct net_device *netdev)
-{
-       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);
-       }
-}
-
-/**
  * \brief Stop Tx queue
  * @param netdev network device
  */
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index 60743c3..82d70e4 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -285,22 +285,6 @@ static pci_ers_result_t 
liquidio_pcie_error_detected(struct pci_dev *pdev,
 };
 
 /**
- * \brief Start Tx queues
- * @param netdev network device
- */
-static void txqs_start(struct net_device *netdev)
-{
-       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);
-       }
-}
-
-/**
  * \brief Start Tx queue
  * @param netdev network device
  */
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h 
b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index 2d2f49b..0a14d77 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -549,4 +549,21 @@ static inline void txqs_wake(struct net_device *netdev)
                netif_wake_queue(netdev);
        }
 }
+
+/**
+ * \brief Start Tx queues
+ * @param netdev network device
+ */
+static inline void txqs_start(struct net_device *netdev)
+{
+       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);
+       }
+}
+
 #endif
-- 
1.8.3.1

Reply via email to