From: Jörg Deckert Date: Sat, 8 May 2021 12:39:32 +0000 (+0200) Subject: networkd: correct batman-adv setting name (GatewayBandwidth) (#19539) X-Git-Tag: v249-rc1~266 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd568427fb545c54c5a06720250957e490e2a00a;p=thirdparty%2Fsystemd.git networkd: correct batman-adv setting name (GatewayBandwidth) (#19539) Co-authored-by: Jörg Deckert --- diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 6381bcfe0c5..9dd081425e2 100644 --- 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 2a9d92e23b5..2de6cd29a34 100644 --- 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 8373ac7e89d..c7c3682eabd 100644 --- 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 6197d701c61..92e77d45920 100644 --- 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