* [dpdk-stable] [PATCH v2 2/4] net: add missing rte prefix on PPPoE defines
[not found] ` <1571838001-591-1-git-send-email-david.marchand@redhat.com>
@ 2019-10-23 13:39 ` David Marchand
2019-10-23 13:40 ` [dpdk-stable] [PATCH v2 3/4] net: add rte prefix to MPLS structure David Marchand
1 sibling, 0 replies; 4+ messages in thread
From: David Marchand @ 2019-10-23 13:39 UTC (permalink / raw)
To: dev; +Cc: olivier.matz, ferruh.yigit, stable
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>
---
Changelog since v1:
- added missing update on release notes,
---
doc/guides/rel_notes/release_19_11.rst | 2 ++
lib/librte_net/rte_ether.h | 4 ++--
lib/librte_pipeline/rte_table_action.c | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index d63413b..e97d2cc 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -164,6 +164,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 aca56aa..29d80ab 100644
--- 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 47d7efb..45dde71 100644
--- 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);
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-stable] [PATCH v2 3/4] net: add rte prefix to MPLS structure
[not found] ` <1571838001-591-1-git-send-email-david.marchand@redhat.com>
2019-10-23 13:39 ` [dpdk-stable] [PATCH v2 2/4] net: add missing rte prefix on PPPoE defines David Marchand
@ 2019-10-23 13:40 ` David Marchand
1 sibling, 0 replies; 4+ messages in thread
From: David Marchand @ 2019-10-23 13:40 UTC (permalink / raw)
To: dev; +Cc: olivier.matz, ferruh.yigit, stable
Add 'rte_' prefix to structures:
- rename struct mpls_hdr as struct rte_mpls_hdr.
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Changelog since v1:
- added missing update on release notes,
---
doc/guides/rel_notes/release_19_11.rst | 2 ++
lib/librte_net/rte_mpls.h | 2 +-
lib/librte_net/rte_net.c | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index e97d2cc..e7752e5 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -166,6 +166,8 @@ API Changes
* The network definitions of PPPoE ethertypes have been prefixed by ``RTE_``.
+* The network structure for MPLS has 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_mpls.h b/lib/librte_net/rte_mpls.h
index 11d26ba..32b6431 100644
--- a/lib/librte_net/rte_mpls.h
+++ b/lib/librte_net/rte_mpls.h
@@ -21,7 +21,7 @@ extern "C" {
/**
* MPLS header.
*/
-struct mpls_hdr {
+struct rte_mpls_hdr {
uint16_t tag_msb; /**< Label(msb). */
#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
uint8_t tag_lsb:4; /**< Label(lsb). */
diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c
index dfccbbf..6f45b13 100644
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c
@@ -278,8 +278,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,
} else if ((proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) ||
(proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLSM))) {
unsigned int i;
- const struct mpls_hdr *mh;
- struct mpls_hdr mh_copy;
+ const struct rte_mpls_hdr *mh;
+ struct rte_mpls_hdr mh_copy;
#define MAX_MPLS_HDR 5
for (i = 0; i < MAX_MPLS_HDR; i++) {
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread