summaryrefslogtreecommitdiff
path: root/src/network/networkd-gperf.gperf
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-02-10 18:41:54 +0100
committerTom Gundersen <teg@jklm.no>2014-02-10 19:00:17 +0100
commit672682a6b9d6fb6a3722c3fea1a93b4831747b54 (patch)
tree8d7956ff4c9171faad0702afe01b9ac2656d3322 /src/network/networkd-gperf.gperf
parent3831838ae7b3ac145711bb84a71cb86cdd829975 (diff)
networkd: VLAN - allow multiple vlans to be created on a link
Also limit the range of vlan ids. Other implementations and documentation use the ranges {0,1}-{4094,4095}, but we use the one accepted by the kernel: 0-4094. Reported-by: Oleksii Shevchuk <alxchk@gmail.com>
Diffstat (limited to 'src/network/networkd-gperf.gperf')
-rw-r--r--src/network/networkd-gperf.gperf4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-gperf.gperf b/src/network/networkd-gperf.gperf
index 37bb8db149..ecc5ca0bab 100644
--- a/src/network/networkd-gperf.gperf
+++ b/src/network/networkd-gperf.gperf
@@ -23,7 +23,7 @@ Match.Name, config_parse_ifname, 0, offsetof(Netw
Network.Description, config_parse_string, 0, offsetof(Network, description)
Network.Bridge, config_parse_bridge, 0, offsetof(Network, bridge)
Network.Bond, config_parse_bond, 0, offsetof(Network, bond)
-Network.VLAN, config_parse_vlan, 0, offsetof(Network, vlan)
+Network.VLAN, config_parse_vlan, 0, offsetof(Network, vlans)
Network.DHCP, config_parse_bool, 0, offsetof(Network, dhcp)
Network.Address, config_parse_address, 0, 0
Network.Gateway, config_parse_gateway, 0, 0
@@ -41,4 +41,4 @@ DHCPv4.CriticalConnection, config_parse_bool, 0, offsetof(Netw
NetDev.Description, config_parse_string, 0, offsetof(NetDev, description)
NetDev.Name, config_parse_ifname, 0, offsetof(NetDev, name)
NetDev.Kind, config_parse_netdev_kind, 0, offsetof(NetDev, kind)
-VLAN.Id, config_parse_int, 0, offsetof(NetDev, vlanid)
+VLAN.Id, config_parse_uint64, 0, offsetof(NetDev, vlanid)