[ovs-dev] [PATCH] We need strip the inner L2 padding bytes, before enapcasulate a packet.

[305753229 at qq.com]

From: Weili Zhang <305753229 at qq.com>

Signed-off-by: Weili Zhang <305753229 at qq.com>
---
 lib/netdev-native-tnl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
index b89dfdd52..acfbb13c4 100644
--- a/lib/netdev-native-tnl.c
+++ b/lib/netdev-native-tnl.c
@@ -149,11 +149,15 @@ void *
 netdev_tnl_push_ip_header(struct dp_packet *packet,
                const void *header, int size, int *ip_tot_size)
 {
+    int padding = dp_packet_l2_pad_size(packet);
     struct eth_header *eth;
     struct ip_header *ip;
     struct ovs_16aligned_ip6_hdr *ip6;
 
     eth = dp_packet_push_uninit(packet, size);
+    if (padding) {
+        dp_packet_set_size(packet, dp_packet_size(packet) - padding);
+    }
     *ip_tot_size = dp_packet_size(packet) - sizeof (struct eth_header);
 
     memcpy(eth, header, size);
-- 
2.24.2 (Apple Git-127)