]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #16998 from zonque/networkd/mdb
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 15 Sep 2020 07:30:39 +0000 (16:30 +0900)
committerGitHub <noreply@github.com>
Tue, 15 Sep 2020 07:30:39 +0000 (16:30 +0900)
network: add support for setting MDB entries

1  2 
src/network/networkd-network-gperf.gperf

index d07714f5a1c85988bdb7484cdadb9842ae06ae6e,7a2d2d5f3c66eecc648ed12f594977e49ba181b5..845fafe17e6f372705993da8303b66221f2977d1
@@@ -39,7 -39,7 +39,7 @@@ Match.Type
  Match.WLANInterfaceType,                     config_parse_match_strv,                                  0,                             offsetof(Network, match_wlan_iftype)
  Match.SSID,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match_ssid)
  Match.BSSID,                                 config_parse_hwaddrs,                                     0,                             offsetof(Network, match_bssid)
 -Match.Name,                                  config_parse_match_ifnames,                               1,                             offsetof(Network, match_name)
 +Match.Name,                                  config_parse_match_ifnames,                               IFNAME_VALID_ALTERNATIVE,      offsetof(Network, match_name)
  Match.Property,                              config_parse_match_property,                              0,                             offsetof(Network, match_property)
  Match.Host,                                  config_parse_net_condition,                               CONDITION_HOST,                offsetof(Network, conditions)
  Match.Virtualization,                        config_parse_net_condition,                               CONDITION_VIRTUALIZATION,      offsetof(Network, conditions)
@@@ -265,6 -265,8 +265,8 @@@ BridgeFDB.VLANId
  BridgeFDB.Destination,                       config_parse_fdb_destination,                             0,                             0
  BridgeFDB.VNI,                               config_parse_fdb_vxlan_vni,                               0,                             0
  BridgeFDB.AssociatedWith,                    config_parse_fdb_ntf_flags,                               0,                             0
+ BridgeMDB.MulticastGroupAddress,             config_parse_mdb_group_address,                           0,                             0
+ BridgeMDB.VLANId,                            config_parse_mdb_vlan_id,                                 0,                             0
  BridgeVLAN.PVID,                             config_parse_brvlan_pvid,                                 0,                             0
  BridgeVLAN.VLAN,                             config_parse_brvlan_vlan,                                 0,                             0
  BridgeVLAN.EgressUntagged,                   config_parse_brvlan_untagged,                             0,                             0