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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
packets.c
diff --git
a/lib/packets.c
b/lib/packets.c
index
6c5e973
..
7238f42
100644
(file)
--- a/
lib/packets.c
+++ b/
lib/packets.c
@@
-329,9
+329,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;
}