net: add rte prefix to ether structures

[dpdk.git] / drivers / net / sfc / sfc.h

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 766336f..dde25c5 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -131,11 +131,10 @@ struct sfc_port {
         * Flow API isolated mode overrides promisc and allmulti settings;
         * they won't be applied if isolated mode is active
         */
-       boolean_t                       isolated;
        boolean_t                       promisc;
        boolean_t                       allmulti;
 
-       struct ether_addr               default_mac_addr;
+       struct rte_ether_addr           default_mac_addr;
 
        unsigned int                    max_mcast_addrs;
        unsigned int                    nb_mcast_addrs;
@@ -176,8 +175,22 @@ struct sfc_rss {
 
 /* Adapter private data shared by primary and secondary processes */
 struct sfc_adapter_shared {
+       unsigned int                    rxq_count;
+       struct sfc_rxq_info             *rxq_info;
+
+       unsigned int                    txq_count;
+       struct sfc_txq_info             *txq_info;
+
+       struct sfc_rss                  rss;
+
+       boolean_t                       isolated;
+       uint32_t                        tunnel_encaps;
+
        struct rte_pci_addr             pci_addr;
        uint16_t                        port_id;
+
+       char                            *dp_rx_name;
+       char                            *dp_tx_name;
 };
 
 /* Adapter process private data */
@@ -206,12 +219,6 @@ struct sfc_adapter {
         */
        struct sfc_adapter_priv         priv;
 
-       /*
-        * Temporary placeholder for multi-process shared data for
-        * transition.
-        */
-       struct sfc_adapter_shared       _shared;
-
        /*
         * PMD setup and configuration is not thread safe. Since it is not
         * performance sensitive, it is better to guarantee thread-safety
@@ -237,7 +244,14 @@ struct sfc_adapter {
        unsigned int                    rxq_max;
        unsigned int                    txq_max;
 
+       unsigned int                    rxq_max_entries;
+       unsigned int                    rxq_min_entries;
+
        unsigned int                    txq_max_entries;
+       unsigned int                    txq_min_entries;
+
+       unsigned int                    evq_max_entries;
+       unsigned int                    evq_min_entries;
 
        uint32_t                        evq_flags;
        unsigned int                    evq_count;
@@ -268,32 +282,38 @@ struct sfc_adapter {
        bool                            mgmt_evq_running;
        struct sfc_evq                  *mgmt_evq;
 
-       unsigned int                    rxq_count;
-       struct sfc_rxq_info             *rxq_info;
        struct sfc_rxq                  *rxq_ctrl;
-
-       unsigned int                    txq_count;
-       struct sfc_txq_info             *txq_info;
        struct sfc_txq                  *txq_ctrl;
 
        boolean_t                       tso;
+       boolean_t                       tso_encap;
 
        uint32_t                        rxd_wait_timeout_ns;
+};
 
-       struct sfc_rss                  rss;
+static inline struct sfc_adapter_shared *
+sfc_adapter_shared_by_eth_dev(struct rte_eth_dev *eth_dev)
+{
+       struct sfc_adapter_shared *sas = eth_dev->data->dev_private;
 
-       /*
-        * Shared memory copy of the Rx datapath name to be used by
-        * the secondary process to find Rx datapath to be used.
-        */
-       char                            *dp_rx_name;
+       return sas;
+}
 
-       /*
-        * Shared memory copy of the Tx datapath name to be used by
-        * the secondary process to find Tx datapath to be used.
-        */
-       char                            *dp_tx_name;
-};
+static inline struct sfc_adapter *
+sfc_adapter_by_eth_dev(struct rte_eth_dev *eth_dev)
+{
+       struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(eth_dev);
+
+       SFC_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
+
+       return container_of(sap, struct sfc_adapter, priv);
+}
+
+static inline struct sfc_adapter_shared *
+sfc_sa2shared(struct sfc_adapter *sa)
+{
+       return sa->priv.shared;
+}
 
 /*
  * Add wrapper functions to acquire/release lock to be able to remove or