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

Moving common function txqs_stop 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 | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 140085b..05c5162f 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 Stop Tx queues
- * @param netdev network device
- */
-static inline void txqs_stop(struct net_device *netdev)
-{
-       if (netif_is_multiqueue(netdev)) {
-               int i;
-
-               for (i = 0; i < netdev->num_tx_queues; i++)
-                       netif_stop_subqueue(netdev, i);
-       } else {
-               netif_stop_queue(netdev);
-       }
-}
-
-/**
  * \brief Start Tx queues
  * @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 3342d64..2e31446 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 Stop Tx queues
- * @param netdev network device
- */
-static void txqs_stop(struct net_device *netdev)
-{
-       if (netif_is_multiqueue(netdev)) {
-               int i;
-
-               for (i = 0; i < netdev->num_tx_queues; i++)
-                       netif_stop_subqueue(netdev, i);
-       } else {
-               netif_stop_queue(netdev);
-       }
-}
-
-/**
  * \brief Start Tx queues
  * @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 76803a5..d8079e35 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -506,4 +506,20 @@ static inline int wait_for_pending_requests(struct 
octeon_device *oct)
        return 0;
 }
 
+/**
+ * \brief Stop Tx queues
+ * @param netdev network device
+ */
+static inline void txqs_stop(struct net_device *netdev)
+{
+       if (netif_is_multiqueue(netdev)) {
+               int i;
+
+               for (i = 0; i < netdev->num_tx_queues; i++)
+                       netif_stop_subqueue(netdev, i);
+       } else {
+               netif_stop_queue(netdev);
+       }
+}
+
 #endif
-- 
1.8.3.1

Reply via email to