From 953da73c7f21c85f68f9316d33c76643fee2a7dd Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvollmer@redhat.com>
Date: Wed, 2 Nov 2016 14:44:00 +0200
Subject: [3/7] networkmanager: Always set REORDER_HDR flag for new VLAN
 devices

https://bugzilla.redhat.com/show_bug.cgi?id=1390605

Upstream commit:
8ceb7172b80efba8e2d5269be078f0e65559b091
    networkmanager: Always set REORDER_HDR flag for new VLAN devices

Closes #5363
Signed-off-by: Stef Walter <stefw@redhat.com>
 * Signing off inclusion in the rhel-7.3.1 branch
---
 dist/networkmanager/network.js     | Bin 132949 -> 132973 bytes
 dist/networkmanager/network.js.map | Bin 1028731 -> 1029014 bytes
 pkg/networkmanager/interfaces.js   |   2 ++
 test/verify/check-networking       |   5 +++++
 4 files changed, 7 insertions(+)

diff --git a/dist/networkmanager/network.js b/dist/networkmanager/network.js
index 2cdd210a34666121baf778b40b08a492e131861b..ac346740af42b474d67e169402a8147b6a46708f 100644
GIT binary patch
delta 42
wcmccG$MLq0V?(5ZxK5siQdv%7o|2AIT25kmF_11*(lKm~P}m-!!1(tW06tp|vj6}9

delta 18
ZcmaFc$8oifV?(4ubD_faLIuV@&j3${2v-0A

diff --git a/dist/networkmanager/network.js.map b/dist/networkmanager/network.js.map
index b037e826b92c6599f15c6c719cf933b98d53936b..dc53b3f715bd55e48472b2325ddf21fa1d556ee4 100644
GIT binary patch
delta 766
zcmezU#BSPiy9u!(X2wZoMuvu_7KVmqmd1w3sTRp58w+RTaB91iIP3U3X1Q(_$}MLR
zNq2H|b+mBOadmWb)G2jxba%}0-aMgj6Dy<TX6N!-OpIom<*JM|87(IVEndl3zWLAM
zw07OBV$U)sXRsa@oj{<@{30ivK#$U5PhXv2N5|kiAQxz0po@;XXW8_AZAMXPGq{`=
zR0^md*h9zN+kE?eZANoRnc@<t?wm51Zm1Gp{p~`oj9-nVN-Mk|7C54s;a{;`v67KX
zA~ikR7gd3KU|xYAs#|p|oP#P0{2=PUo&dQsxC%pEda+Z8Hip7b{pk}XGKxqQ7NQve
zb!>Ri_I(o>cSy=uz!X#%qWLGXYWt+sjK04av$sE3#$-@5T|kVP#a>@uLETVYA+uPa
zBqLQJB{eOvG^a#IA*r-Pp*&R~FEuqqp(J0SIJHC}vqT}aq97+TIkP0EQXw&~vOKX;
zZ@Qp3v)FWf31%+Qw4B8B;us|z1vpSIRi7TPo>gi3gcmF<(;e8DIj8p@=HzX+mShHE
z79eH?Vm2UV2V#!x){>kbU9hI1>4hRZLDTKlF$r$JBEqwnX}en@r+(7(2ip9U`{3ds
rPB{szj@MBzoc?eox9s!_D>ymZfldcvE+FOxVjdvo-QItg@69^^8|3Zo

delta 595
zcmbRC-0t@iy9u!(<|Y<K28pJr$tFq0M&>DINhxWT8w+RTaGJT5IP3U3>bq<f$}MMM
z&vbHhcP#MSJhyNYE2HV=fbv^Rj7FQatBf@nO((}MUddRznR7{6JClCV^g?Y$QMbZk
zPhXv2N5|m2A}1YJN5?=H9e2;7V$U)sXAsxXMJEtQ=6mS`dl|u%dO=kJ6$E?exO*FK
zKcmfPE-8~=0yQkB3}zTqiLd!~c~{1-#xjK!UJ&~nQO)o#$?~19=*p<SJ-(9hrg*(Y
zmM^M0_rR<IKU7!gSU3lj7WhHbft?F-eQ+6uy7XeF5Hk#gq2?G0EB(T93qb~o0DT5C
z5$c8TyzQqaGVYL+F#)RpDyT3-^JQe&_W7$BeSb5iZ-2Xt$)IR@ff%#kbcNGwtkd5!
zGILB{b%c|5`gbE{zUc*$%xu$79^tfXmy==!Viq7~1!6WJW(Q)9?Q&9_OI)x<`}7`B
zo}lU8>zD+$zZd0M%(VSZBBy@R^m~VZh6~*1Vwrwn4JSwY$|IaW%mu{UK+FTgyxUhE
I;d}cI00B+B-T(jq

diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js
index 9c2cf43..fa95d9c 100644
--- a/pkg/networkmanager/interfaces.js
+++ b/pkg/networkmanager/interfaces.js
@@ -743,6 +743,8 @@ function NetworkManagerModel() {
             set("vlan", "parent",         's', settings.vlan.parent);
             set("vlan", "id",             'u', settings.vlan.id);
             set("vlan", "interface-name", 's', settings.vlan.interface_name);
+            // '1' is the default, but we need to set it explicitly anyway.
+            set("vlan", "flags",          'u', 1);
         }
 
         if (settings.ethernet) {
diff --git a/test/verify/check-networking b/test/verify/check-networking
index 1133eec..711cd0c 100755
--- a/test/verify/check-networking
+++ b/test/verify/check-networking
@@ -396,6 +396,11 @@ class TestNetworking(MachineCase):
         b.click(".panel-heading .btn:contains('On')")
         b.wait_not_in_text("tr:contains('Status')", "Inactive")
 
+        # Check that the actual kernel device has the REORDER_HDR flag
+        # set.  NetworkManager stopped doing that for connections
+        # created via D-Bus at some point.
+        self.assertIn("REORDER_HDR", m.execute("ip -d link show tvlan | grep vlan"))
+
         # Delete it
         b.click("#network-interface button:contains('Delete')")
         b.wait_visible("#networking")
-- 
2.5.5