git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always insert MPLS labels after VLAN tags.
[sliver-openvswitch.git]
/
lib
/
odp-util.c
diff --git
a/lib/odp-util.c
b/lib/odp-util.c
index
b81d0d2
..
e20564f
100644
(file)
--- a/
lib/odp-util.c
+++ b/
lib/odp-util.c
@@
-3548,10
+3548,6
@@
commit_mpls_action(const struct flow *flow, struct flow *base,
while (base_n < flow_n) {
struct ovs_action_push_mpls *mpls;
while (base_n < flow_n) {
struct ovs_action_push_mpls *mpls;
- /* If there's a VLAN tag, pop it off so that our new MPLS label doesn't
- * end up outside it. */
- pop_vlan(base, odp_actions, wc);
-
mpls = nl_msg_put_unspec_zero(odp_actions,
OVS_ACTION_ATTR_PUSH_MPLS,
sizeof *mpls);
mpls = nl_msg_put_unspec_zero(odp_actions,
OVS_ACTION_ATTR_PUSH_MPLS,
sizeof *mpls);