liquidio: Moved common definition octnic_gather to octeon_network.h

Moving common definition octnic_gather 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 cb5df7c..00d5634 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -144,27 +144,6 @@ union tx_info {
 #define OCTNIC_GSO_MAX_SIZE                                                    \
        (CN23XX_DEFAULT_INPUT_JABBER - OCTNIC_GSO_MAX_HEADER_SIZE)
 
-/** Structure of a node in list of gather components maintained by
- * NIC driver for each network device.
- */
-struct octnic_gather {
-       /** List manipulation. Next and prev pointers. */
-       struct list_head list;
-
-       /** Size of the gather component at sg in bytes. */
-       int sg_size;
-
-       /** Number of bytes that sg was adjusted to make it 8B-aligned. */
-       int adjust;
-
-       /** Gather component that can accommodate max sized fragment list
-        *  received from the IP layer.
-        */
-       struct octeon_sg_entry *sg;
-
-       dma_addr_t sg_dma_ptr;
-};
-
 struct handshake {
        struct completion init;
        struct completion started;

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index ab47fbb..c4ba7ee 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -75,24 +75,6 @@ union tx_info {
 #define OCTNIC_GSO_MAX_SIZE \
                (CN23XX_DEFAULT_INPUT_JABBER - OCTNIC_GSO_MAX_HEADER_SIZE)
 
-struct octnic_gather {
-       /* List manipulation. Next and prev pointers. */
-       struct list_head list;
-
-       /* Size of the gather component at sg in bytes. */
-       int sg_size;
-
-       /* Number of bytes that sg was adjusted to make it 8B-aligned. */
-       int adjust;
-
-       /* Gather component that can accommodate max sized fragment list
-        * received from the IP layer.
-        */
-       struct octeon_sg_entry *sg;
-
-       dma_addr_t sg_dma_ptr;
-};
-
 static int
 liquidio_vf_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static void liquidio_vf_remove(struct pci_dev *pdev);

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index 777af06..caf25b8 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -47,6 +47,27 @@ struct liquidio_if_cfg_resp {
        u64 status;
 };
 
+/* Structure of a node in list of gather components maintained by
+ * NIC driver for each network device.
+ */
+struct octnic_gather {
+       /* List manipulation. Next and prev pointers. */
+       struct list_head list;
+
+       /* Size of the gather component at sg in bytes. */
+       int sg_size;
+
+       /* Number of bytes that sg was adjusted to make it 8B-aligned. */
+       int adjust;
+
+       /* Gather component that can accommodate max sized fragment list
+        * received from the IP layer.
+        */
+       struct octeon_sg_entry *sg;
+
+       dma_addr_t sg_dma_ptr;
+};
+
 struct oct_nic_stats_resp {
        u64     rh;
        struct oct_link_stats stats;