liquidio: Moved common function txqs_wake to octeon_network.h

Moving common function txqs_wake to octeon_network.h

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>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 205a298..8a809b4 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -530,34 +530,6 @@ static inline void txqs_start(struct net_device *netdev)
 }
 
 /**
- * \brief Wake Tx queues
- * @param netdev network device
- */
-static inline void txqs_wake(struct net_device *netdev)
-{
-       struct lio *lio = GET_LIO(netdev);
-
-       if (netif_is_multiqueue(netdev)) {
-               int i;
-
-               for (i = 0; i < netdev->num_tx_queues; i++) {
-                       int qno = lio->linfo.txpciq[i %
-                               lio->oct_dev->num_iqs].s.q_no;
-
-                       if (__netif_subqueue_stopped(netdev, i)) {
-                               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno,
-                                                         tx_restart, 1);
-                               netif_wake_subqueue(netdev, i);
-                       }
-               }
-       } else {
-               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq,
-                                         tx_restart, 1);
-               netif_wake_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 2e31446..60743c3 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -301,33 +301,6 @@ static void txqs_start(struct net_device *netdev)
 }
 
 /**
- * \brief Wake Tx queues
- * @param netdev network device
- */
-static void txqs_wake(struct net_device *netdev)
-{
-       struct lio *lio = GET_LIO(netdev);
-
-       if (netif_is_multiqueue(netdev)) {
-               int i;
-
-               for (i = 0; i < netdev->num_tx_queues; i++) {
-                       int qno = lio->linfo.txpciq[i % lio->oct_dev->num_iqs]
-                                     .s.q_no;
-                       if (__netif_subqueue_stopped(netdev, i)) {
-                               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno,
-                                                         tx_restart, 1);
-                               netif_wake_subqueue(netdev, i);
-                       }
-               }
-       } else {
-               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq,
-                                         tx_restart, 1);
-               netif_wake_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 d8079e3..2d2f49b 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -522,4 +522,31 @@ static inline void txqs_stop(struct net_device *netdev)
        }
 }
 
+/**
+ * \brief Wake Tx queues
+ * @param netdev network device
+ */
+static inline void txqs_wake(struct net_device *netdev)
+{
+       struct lio *lio = GET_LIO(netdev);
+
+       if (netif_is_multiqueue(netdev)) {
+               int i;
+
+               for (i = 0; i < netdev->num_tx_queues; i++) {
+                       int qno = lio->linfo.txpciq[i %
+                               lio->oct_dev->num_iqs].s.q_no;
+
+                       if (__netif_subqueue_stopped(netdev, i)) {
+                               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, qno,
+                                                         tx_restart, 1);
+                               netif_wake_subqueue(netdev, i);
+                       }
+               }
+       } else {
+               INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, lio->txq,
+                                         tx_restart, 1);
+               netif_wake_queue(netdev);
+       }
+}
 #endif