src/basic/string-util.h

@@ -130,12 +130,7 @@ static inline bool _pure_ in_charset(const char *s, const char* charset) {
 }
 
 static inline bool char_is_cc(char p) {
-        /* char is unsigned on some architectures, e.g. aarch64. So, compiler may warn the condition
+        return (uint8_t) p < ' ' || p == 127;
-         * p >= 0 is always true. See #19543. Hence, let's cast to unsigned before the comparison. Note
-         * that the cast in the right hand side is redundant, as according to the C standard, compilers
-         * automatically cast a signed value to unsigned when comparing with an unsigned variable. Just
-         * for safety and readability. */
-        return (uint8_t) p < (uint8_t) ' ' || p == 127;
 }
 bool string_has_cc(const char *p, const char *ok) _pure_;
 

src/network/netdev/netdev-gperf.gperf

@@ -244,8 +244,6 @@ 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)

test/fuzz/fuzz-netdev-parser/28-batadv.netdev

@@ -11,6 +11,6 @@ DistributedArpTable=1
 Fragmentation=1
 HopPenalty=10
 OriginatorIntervalSec=1
-GatewayBandwidthDown=100K
+GatewayBandwithDown=100K
-GatewayBandwidthUp=12K
+GatewayBandwithUp=12K
 RoutingAlgorithm=batman-v

test/fuzz/fuzz-netdev-parser/directives.netdev

@@ -234,6 +234,4 @@ HopPenalty=
 OriginatorIntervalSec=
 GatewayBandwithDown=
 GatewayBandwithUp=
-GatewayBandwidthDown=
-GatewayBandwidthUp=
 RoutingAlgorithm=

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

@@ -10,5 +10,5 @@ DistributedArpTable=1
 Fragmentation=0
 HopPenalty=10
 OriginatorIntervalSec=1000ms
-GatewayBandwidthDown=205M
+GatewayBandwithDown=205M
-GatewayBandwidthUp=2G
+GatewayBandwithUp=2G