[PATCH net-next 04/13] liquidio: Moved common function skb_iq to to octeon_network.h

[Felix Manlunas]

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

Moving common function skb_iq to 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       | 10 ----------
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c    | 10 ----------
 drivers/net/ethernet/cavium/liquidio/octeon_network.h | 10 ++++++++++
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 8e280c5..ec7c403 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1687,16 +1687,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct)
        return 0;
 }
 
-static inline int skb_iq(struct lio *lio, struct sk_buff *skb)
-{
-       int q = 0;
-
-       if (netif_is_multiqueue(lio->netdev))
-               q = skb->queue_mapping % lio->linfo.num_txpciq;
-
-       return q;
-}
-
 /**
  * \brief Check Tx queue state for a given network buffer
  * @param lio per-network private data
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c 
b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index 82d70e4..5f0114d 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -993,16 +993,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct)
        return 0;
 }
 
-static int skb_iq(struct lio *lio, struct sk_buff *skb)
-{
-       int q = 0;
-
-       if (netif_is_multiqueue(lio->netdev))
-               q = skb->queue_mapping % lio->linfo.num_txpciq;
-
-       return q;
-}
-
 /**
  * \brief Check Tx queue state for a given network buffer
  * @param lio per-network private data
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h 
b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index 0a14d77..cd334a7 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -566,4 +566,14 @@ static inline void txqs_start(struct net_device *netdev)
        }
 }
 
+static inline int skb_iq(struct lio *lio, struct sk_buff *skb)
+{
+       int q = 0;
+
+       if (netif_is_multiqueue(lio->netdev))
+               q = skb->queue_mapping % lio->linfo.num_txpciq;
+
+       return q;
+}
+
 #endif
-- 
1.8.3.1