diff mbox series

[2/5] net/tap: revert changes on rte_ prefixing

Message ID 1559129358-2935-2-git-send-email-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Headers
Series [1/5] test/table: remove duplicate macro |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation fail Compilation issues

Commit Message

David Marchand May 29, 2019, 11:29 a.m. UTC 
  This source is compiled as a bpf program out of dpdk.
Revert to structures/macros coming from libc.

Fixes: 6d13ea8e8e49 ("net: add rte prefix to ether structures")
Fixes: 24ac604ef746 ("net: add rte prefix to IP defines")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/tap/tap_bpf_program.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Wiles, Keith May 29, 2019, 1:36 p.m. UTC | #1 
> On May 29, 2019, at 6:29 AM, David Marchand <david.marchand@redhat.com> wrote:
> 
> This source is compiled as a bpf program out of dpdk.
> Revert to structures/macros coming from libc.
> 
> Fixes: 6d13ea8e8e49 ("net: add rte prefix to ether structures")
> Fixes: 24ac604ef746 ("net: add rte prefix to IP defines")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/tap/tap_bpf_program.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/tap/tap_bpf_program.c b/drivers/net/tap/tap_bpf_program.c

Did not test the whole patch, but the changes to TAP PMD seem reasonable.

Ack just the TAP PMD changes.

Acked-by Keith.Wiles<keith.wiles@intel.com>

Regards,
Keith
Olivier Matz May 29, 2019, 2:26 p.m. UTC | #2 
On Wed, May 29, 2019 at 01:29:15PM +0200, David Marchand wrote:
> This source is compiled as a bpf program out of dpdk.
> Revert to structures/macros coming from libc.
> 
> Fixes: 6d13ea8e8e49 ("net: add rte prefix to ether structures")
> Fixes: 24ac604ef746 ("net: add rte prefix to IP defines")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>

Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
diff mbox series

Patch

diff --git a/drivers/net/tap/tap_bpf_program.c b/drivers/net/tap/tap_bpf_program.c
index 531569b..532e883 100644
--- a/drivers/net/tap/tap_bpf_program.c
+++ b/drivers/net/tap/tap_bpf_program.c
@@ -19,7 +19,7 @@ 
 #include "tap_rss.h"
 
 /** Create IPv4 address */
-#define RTE_IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \
+#define IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \
 		(((b) & 0xff) << 16) | \
 		(((c) & 0xff) << 8)  | \
 		((d) & 0xff))
@@ -37,7 +37,7 @@ 
 #define KEY_IDX			0
 #define BPF_MAP_ID_KEY	1
 
-struct rte_vlan_hdr {
+struct vlan_hdr {
 	__be16 proto;
 	__be16 tci;
 };
@@ -141,12 +141,12 @@  static int __attribute__((always_inline))
 
 	/* Get correct proto for 802.1ad */
 	if (skb->vlan_present && skb->vlan_proto == htons(ETH_P_8021AD)) {
-		if (data + ETH_ALEN * 2 + sizeof(struct rte_vlan_hdr) +
+		if (data + ETH_ALEN * 2 + sizeof(struct vlan_hdr) +
 		    sizeof(proto) > data_end)
 			return TC_ACT_OK;
 		proto = *(__u16 *)(data + ETH_ALEN * 2 +
-				   sizeof(struct rte_vlan_hdr));
-		off += sizeof(struct rte_vlan_hdr);
+				   sizeof(struct vlan_hdr));
+		off += sizeof(struct vlan_hdr);
 	}
 
 	if (proto == htons(ETH_P_IP)) {
@@ -157,11 +157,11 @@  static int __attribute__((always_inline))
 		__u8 *src_dst_addr = data + off + offsetof(struct iphdr, saddr);
 		__u8 *src_dst_port = data + off + sizeof(struct iphdr);
 		struct ipv4_l3_l4_tuple v4_tuple = {
-			.src_addr = RTE_IPv4(*(src_dst_addr + 0),
+			.src_addr = IPv4(*(src_dst_addr + 0),
 					*(src_dst_addr + 1),
 					*(src_dst_addr + 2),
 					*(src_dst_addr + 3)),
-			.dst_addr = RTE_IPv4(*(src_dst_addr + 4),
+			.dst_addr = IPv4(*(src_dst_addr + 4),
 					*(src_dst_addr + 5),
 					*(src_dst_addr + 6),
 					*(src_dst_addr + 7)),