d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: add rte prefix to GRE structure

Browse Source 
Add 'rte_' prefix to structures:
- rename struct gre_hdr as struct rte_gre_hdr.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Olivier Matz 2019-05-21 18:13:07 +02:00 committed by Ferruh Yigit
parent 5ef2546767
commit be11774d45
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -1218,7 +1218,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
struct udp_hdr *udp = NULL;
struct rte_vxlan_hdr *vxlan = NULL;
struct rte_vxlan_gpe_hdr *vxlan_gpe = NULL;
struct gre_hdr *gre = NULL;
struct rte_gre_hdr *gre = NULL;
size_t len;
size_t temp_size = 0;
@ -1331,7 +1331,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
break;
case RTE_FLOW_ITEM_TYPE_GRE:
case RTE_FLOW_ITEM_TYPE_NVGRE:
gre = (struct gre_hdr *)&buf[temp_size];
gre = (struct rte_gre_hdr *)&buf[temp_size];
if (!gre->proto)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,

2
lib/librte_net/rte_gre.h
View File

@ -16,7 +16,7 @@ extern "C" {
* GRE Header
*/
__extension__
struct gre_hdr {
struct rte_gre_hdr {
#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
uint16_t res2:4; /**< Reserved */
uint16_t s:1; /**< Sequence Number Present bit */

4
lib/librte_net/rte_net.c
View File

@ -140,8 +140,8 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m,
[0xa] = 12,
[0xb] = 16,
};
const struct gre_hdr *gh;
struct gre_hdr gh_copy;
const struct rte_gre_hdr *gh;
struct rte_gre_hdr gh_copy;
uint16_t flags;
gh = rte_pktmbuf_read(m, *off, sizeof(*gh), &gh_copy);