networkd: correct batman-adv setting name (GatewayBandwidth) (#19539)

Co-authored-by: Jörg Deckert <jdeckert@unitas-network.de>

diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
index 6381bcfe0c5dcd3e56e4189d8404cc315525102b..9dd081425e2e1276bff051f6f64c651a0739b412 100644 (file)
--- a/src/network/netdev/netdev-gperf.gperf
+++ b/src/network/netdev/netdev-gperf.gperf
@@ -244,6 +244,8 @@ BatmanAdvanced.Fragmentation,             config_parse_bool,
 BatmanAdvanced.GatewayMode,               config_parse_batadv_gateway_mode,          0,                             offsetof(BatmanAdvanced, gateway_mode)
 BatmanAdvanced.GatewayBandwithDown,       config_parse_badadv_bandwidth,             0,                             offsetof(BatmanAdvanced, gateway_bandwidth_down)
 BatmanAdvanced.GatewayBandwithUp,         config_parse_badadv_bandwidth,             0,                             offsetof(BatmanAdvanced, gateway_bandwidth_up)
+BatmanAdvanced.GatewayBandwidthDown,      config_parse_badadv_bandwidth,             0,                             offsetof(BatmanAdvanced, gateway_bandwidth_down)
+BatmanAdvanced.GatewayBandwidthUp,        config_parse_badadv_bandwidth,             0,                             offsetof(BatmanAdvanced, gateway_bandwidth_up)
 BatmanAdvanced.HopPenalty,                config_parse_uint8,                        0,                             offsetof(BatmanAdvanced, hop_penalty)
 BatmanAdvanced.OriginatorIntervalSec,     config_parse_sec,                          0,                             offsetof(BatmanAdvanced, originator_interval)
 BatmanAdvanced.RoutingAlgorithm,          config_parse_batadv_routing_algorithm,     0,                             offsetof(BatmanAdvanced, routing_algorithm)

diff --git a/test/fuzz/fuzz-netdev-parser/28-batadv.netdev b/test/fuzz/fuzz-netdev-parser/28-batadv.netdev
index 2a9d92e23b5b20da0b144a1c129436881372b4ee..2de6cd29a34d13cdcb57139bfd1f471b855f8feb 100644 (file)
--- a/test/fuzz/fuzz-netdev-parser/28-batadv.netdev
+++ b/test/fuzz/fuzz-netdev-parser/28-batadv.netdev
@@ -11,6 +11,6 @@ DistributedArpTable=1
 Fragmentation=1
 HopPenalty=10
 OriginatorIntervalSec=1
-GatewayBandwithDown=100K
-GatewayBandwithUp=12K
+GatewayBandwidthDown=100K
+GatewayBandwidthUp=12K
 RoutingAlgorithm=batman-v

diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev
index 8373ac7e89dd04943a82ea628cfddd3f6e3f444a..c7c3682eabd0318d8ffc7a20f9a43d18acfb54b1 100644 (file)
--- a/test/fuzz/fuzz-netdev-parser/directives.netdev
+++ b/test/fuzz/fuzz-netdev-parser/directives.netdev
@@ -234,4 +234,6 @@ HopPenalty=
 OriginatorIntervalSec=
 GatewayBandwithDown=
 GatewayBandwithUp=
+GatewayBandwidthDown=
+GatewayBandwidthUp=
 RoutingAlgorithm=

diff --git a/test/test-network/conf/25-batadv.netdev b/test/test-network/conf/25-batadv.netdev
index 6197d701c61a2fb0439ae9b12f6796e44473ed91..92e77d4592091f673a5682179ebd884d21e4151b 100644 (file)
--- a/test/test-network/conf/25-batadv.netdev
+++ b/test/test-network/conf/25-batadv.netdev
@@ -10,5 +10,5 @@ DistributedArpTable=1
 Fragmentation=0
 HopPenalty=10
 OriginatorIntervalSec=1000ms
-GatewayBandwithDown=205M
-GatewayBandwithUp=2G
+GatewayBandwidthDown=205M
+GatewayBandwidthUp=2G