lib/flow: Retain ODPP_NONE on flow_extract().

[sliver-openvswitch.git] / lib / packets.c

diff --git a/lib/packets.c b/lib/packets.c
index 095908f..0c023fc 100644 (file)
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -29,6 +29,7 @@
 #include "dynamic-string.h"
 #include "ofpbuf.h"
 #include "ovs-thread.h"
+#include "odp-util.h"
 #include "unaligned.h"
 
 const struct in6_addr in6addr_exact = IN6ADDR_EXACT_INIT;
@@ -176,7 +177,7 @@ compose_rarp(struct ofpbuf *b, const uint8_t eth_src[ETH_ADDR_LEN])
  *
  * Also sets 'packet->l2' to point to the new Ethernet header. */
 void
-eth_push_vlan(struct ofpbuf *packet, ovs_be16 tci)
+eth_push_vlan(struct ofpbuf *packet, ovs_be16 tpid, ovs_be16 tci)
 {
     struct eth_header *eh = packet->data;
     struct vlan_eth_header *veh;
@@ -185,7 +186,7 @@ eth_push_vlan(struct ofpbuf *packet, ovs_be16 tci)
     struct vlan_eth_header tmp;
     memcpy(tmp.veth_dst, eh->eth_dst, ETH_ADDR_LEN);
     memcpy(tmp.veth_src, eh->eth_src, ETH_ADDR_LEN);
-    tmp.veth_type = htons(ETH_TYPE_VLAN);
+    tmp.veth_type = tpid;
     tmp.veth_tci = tci & htons(~VLAN_CFI);
     tmp.veth_next_type = eh->eth_type;
 
@@ -218,7 +219,7 @@ eth_pop_vlan(struct ofpbuf *packet)
 }
 
 /* Set ethertype of the packet. */
-void
+static void
 set_ethertype(struct ofpbuf *packet, ovs_be16 eth_type)
 {
     struct eth_header *eh = packet->data;
@@ -329,9 +330,10 @@ push_mpls(struct ofpbuf *packet, ovs_be16 ethtype, ovs_be32 lse)
         return;
     }
 
+    set_ethertype(packet, ethtype);
+
     if (!is_mpls(packet)) {
-        /* Set ethtype and MPLS label stack entry. */
-        set_ethertype(packet, ethtype);
+        /* Set MPLS label stack entry. */
         packet->l2_5 = packet->l3;
     }
 
@@ -425,7 +427,7 @@ eth_addr_bitand(const uint8_t src[ETH_ADDR_LEN],
 int
 ip_count_cidr_bits(ovs_be32 netmask)
 {
-    return 32 - ctz(ntohl(netmask));
+    return 32 - ctz32(ntohl(netmask));
 }
 
 void
@@ -743,13 +745,13 @@ packet_update_csum128(struct ofpbuf *packet, uint8_t proto,
 
 static void
 packet_set_ipv6_addr(struct ofpbuf *packet, uint8_t proto,
-                     ovs_16aligned_be32 *addr, const ovs_be32 new_addr[4],
+                     ovs_16aligned_be32 addr[4], const ovs_be32 new_addr[4],
                      bool recalculate_csum)
 {
     if (recalculate_csum) {
         packet_update_csum128(packet, proto, addr, new_addr);
     }
-    memcpy(addr, new_addr, sizeof(*addr));
+    memcpy(addr, new_addr, sizeof(ovs_be32[4]));
 }
 
 static void