Merge pull request #22471 from yuwata/network-bridge-vlan-protocol

network: bridge: fix vlan protocol

test/test-network/conf/25-bridge.netdev

@@ -6,10 +6,14 @@ Kind=bridge
 [Bridge]
 HelloTimeSec=9
 MaxAgeSec=9
-ForwardDelaySec=9
 AgeingTimeSec=9
+ForwardDelaySec=9
 Priority=9
-MulticastQuerier= true
-MulticastSnooping=true
+#GroupForwardMask=9 # This interferes other other settings
+DefaultPVID=9
+MulticastQuerier=yes
+MulticastSnooping=yes
+VLANFiltering=yes
+VLANProtocol=802.1ad
 STP=true
 MulticastIGMPVersion=3

test/test-network/systemd-networkd-tests.py

@@ -1185,6 +1185,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'STP: yes')
         self.assertRegex(output, 'Multicast IGMP Version: 3')
 
+        output = check_output('ip -d link show bridge99')
+        print(output)
+        self.assertIn('vlan_filtering 1 ', output)
+        self.assertIn('vlan_protocol 802.1ad ', output)
+        self.assertIn('vlan_default_pvid 9 ', output)
+
     def test_bond(self):
         copy_unit_to_networkd_unit_path('25-bond.netdev', '25-bond-balanced-tlb.netdev')
         start_networkd()