net: add rte prefix to ether structures

[dpdk.git] / drivers / net / softnic / rte_eth_softnic.c

diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 743a7c5..4bda2f2 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -22,6 +22,7 @@
 #define PMD_PARAM_FIRMWARE                                 "firmware"
 #define PMD_PARAM_CONN_PORT                                "conn_port"
 #define PMD_PARAM_CPU_ID                                   "cpu_id"
+#define PMD_PARAM_SC                                       "sc"
 #define PMD_PARAM_TM_N_QUEUES                              "tm_n_queues"
 #define PMD_PARAM_TM_QSIZE0                                "tm_qsize0"
 #define PMD_PARAM_TM_QSIZE1                                "tm_qsize1"
@@ -32,6 +33,7 @@ static const char * const pmd_valid_args[] = {
        PMD_PARAM_FIRMWARE,
        PMD_PARAM_CONN_PORT,
        PMD_PARAM_CPU_ID,
+       PMD_PARAM_SC,
        PMD_PARAM_TM_N_QUEUES,
        PMD_PARAM_TM_QSIZE0,
        PMD_PARAM_TM_QSIZE1,
@@ -59,23 +61,6 @@ static const struct softnic_conn_params conn_params_default = {
        .msg_handle_arg = NULL,
 };
 
-static const struct rte_eth_dev_info pmd_dev_info = {
-       .min_rx_bufsize = 0,
-       .max_rx_pktlen = UINT32_MAX,
-       .max_rx_queues = UINT16_MAX,
-       .max_tx_queues = UINT16_MAX,
-       .rx_desc_lim = {
-               .nb_max = UINT16_MAX,
-               .nb_min = 0,
-               .nb_align = 1,
-       },
-       .tx_desc_lim = {
-               .nb_max = UINT16_MAX,
-               .nb_min = 0,
-               .nb_align = 1,
-       },
-};
-
 static int pmd_softnic_logtype;
 
 #define PMD_LOG(level, fmt, args...) \
@@ -86,7 +71,9 @@ static void
 pmd_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        struct rte_eth_dev_info *dev_info)
 {
-       memcpy(dev_info, &pmd_dev_info, sizeof(*dev_info));
+       dev_info->max_rx_pktlen = UINT32_MAX;
+       dev_info->max_rx_queues = UINT16_MAX;
+       dev_info->max_tx_queues = UINT16_MAX;
 }
 
 static int
@@ -352,7 +339,7 @@ pmd_free(struct pmd_internals *p)
        rte_free(p);
 }
 
-static struct ether_addr eth_addr = {
+static struct rte_ether_addr eth_addr = {
        .addr_bytes = {0},
 };
 
@@ -441,6 +428,7 @@ pmd_parse_args(struct pmd_params *p, const char *params)
        memset(p, 0, sizeof(*p));
        p->firmware = SOFTNIC_FIRMWARE;
        p->cpu_id = SOFTNIC_CPU_ID;
+       p->sc = SOFTNIC_SC;
        p->tm.n_queues = SOFTNIC_TM_N_QUEUES;
        p->tm.qsize[0] = SOFTNIC_TM_QUEUE_SIZE;
        p->tm.qsize[1] = SOFTNIC_TM_QUEUE_SIZE;
@@ -471,6 +459,14 @@ pmd_parse_args(struct pmd_params *p, const char *params)
                        goto out_free;
        }
 
+       /* Service cores (optional) */
+       if (rte_kvargs_count(kvlist, PMD_PARAM_SC) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_SC,
+                       &get_uint32, &p->sc);
+               if (ret < 0)
+                       goto out_free;
+       }
+
        /* TM number of queues (optional) */
        if (rte_kvargs_count(kvlist, PMD_PARAM_TM_N_QUEUES) == 1) {
                ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_N_QUEUES,