net: add missing rte prefix on PPPoE defines

Those two defines have been missed.

Fixes: 35b2d13fd6fd ("net: add rte prefix to ether defines")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index 007a0c8f872c0ba28e1ee9cf053afde9677068ac..0e7613c85b93f0c21235bf8e1ebdfbe708477ea9 100644 (file)
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -276,6 +276,8 @@ API Changes
 
 * The network structure ``esp_tail`` has been prefixed by ``rte_``.
 
+* The network definitions of PPPoE ethertypes have been prefixed by ``RTE_``.
+
 * ethdev: changed ``rte_eth_dev_infos_get`` return value from ``void`` to
   ``int`` to provide a way to report various error conditions.
 

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index aa6eff037f228671af378d2acf2609a373dc0660..7c89626edd7fd9052e8e5979be74ce229ea78e1e 100644 (file)
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -302,8 +302,8 @@ struct rte_vxlan_hdr {
 #define RTE_ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */
 #define RTE_ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */
 #define RTE_ETHER_TYPE_QINQ 0x88A8 /**< IEEE 802.1ad QinQ tagging. */
-#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863 /**< PPPoE Discovery Stage. */
-#define ETHER_TYPE_PPPOE_SESSION 0x8864 /**< PPPoE Session Stage. */
+#define RTE_ETHER_TYPE_PPPOE_DISCOVERY 0x8863 /**< PPPoE Discovery Stage. */
+#define RTE_ETHER_TYPE_PPPOE_SESSION 0x8864 /**< PPPoE Session Stage. */
 #define RTE_ETHER_TYPE_ETAG 0x893F /**< IEEE 802.1BR E-Tag. */
 #define RTE_ETHER_TYPE_1588 0x88F7
        /**< IEEE 802.1AS 1588 Precise Time Protocol. */

diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c
index 47d7efbc1cc8e4f9cbd2b9e1b663ce93f674c780..45dde7119f7a8b84d54aea595a82b71998761587 100644 (file)
--- a/lib/librte_pipeline/rte_table_action.c
+++ b/lib/librte_pipeline/rte_table_action.c
@@ -696,7 +696,7 @@ encap_qinq_pppoe_apply(void *data,
        d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,
                p->qinq.cvlan.dei,
                p->qinq.cvlan.vid));
-       d->cvlan.eth_proto = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+       d->cvlan.eth_proto = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION);
 
        /* PPPoE and PPP*/
        d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
@@ -747,7 +747,7 @@ encap_pppoe_apply(void *data,
        /* Ethernet */
        rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
        rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
-       d->ether.ether_type = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+       d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION);
 
        /* PPPoE and PPP*/
        d->pppoe_ppp.ver_type_code = rte_htons(0x1100);