Skip to content

Commit faa507e

Browse files
rluboskartben
authored andcommitted
net: Fix misc Kconfig style issues in networking area
Fix misc Kconfig style issues in networking area. Signed-off-by: Robert Lubos <[email protected]>
1 parent 7236e9f commit faa507e

File tree

7 files changed

+161
-119
lines changed

7 files changed

+161
-119
lines changed

subsys/mgmt/osdp/Kconfig

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ if OSDP
1818

1919
choice
2020
prompt "OSDP Mode of Operation"
21-
config OSDP_MODE_PD
22-
bool "Configure OSDP in Peripheral Device mode"
23-
help
24-
Configure this device to operate as a PD (Peripheral Device)
25-
config OSDP_MODE_CP
26-
bool "Configure OSDP in Control Panel mode"
27-
help
28-
Configure this device to operate as a CP (Control Panel)
21+
22+
config OSDP_MODE_PD
23+
bool "Configure OSDP in Peripheral Device mode"
24+
help
25+
Configure this device to operate as a PD (Peripheral Device)
26+
27+
config OSDP_MODE_CP
28+
bool "Configure OSDP in Control Panel mode"
29+
help
30+
Configure this device to operate as a CP (Control Panel)
31+
2932
endchoice
3033

3134
config OSDP_UART_BAUD_RATE

subsys/net/l2/ethernet/gptp/Kconfig

Lines changed: 57 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,44 +41,63 @@ choice
4141
the actual capabilities of the hardware.
4242
See 7.6.2.5 of IEEE 1588-2008 for more info.
4343

44-
config NET_GPTP_CLOCK_ACCURACY_UNKNOWN
45-
bool "Unknown"
46-
config NET_GPTP_CLOCK_ACCURACY_25NS
47-
bool "25ns"
48-
config NET_GPTP_CLOCK_ACCURACY_100NS
49-
bool "100ns"
50-
config NET_GPTP_CLOCK_ACCURACY_250NS
51-
bool "250ns"
52-
config NET_GPTP_CLOCK_ACCURACY_1US
53-
bool "1us"
54-
config NET_GPTP_CLOCK_ACCURACY_2_5US
55-
bool "2.5us"
56-
config NET_GPTP_CLOCK_ACCURACY_10US
57-
bool "10us"
58-
config NET_GPTP_CLOCK_ACCURACY_25US
59-
bool "25us"
60-
config NET_GPTP_CLOCK_ACCURACY_100US
61-
bool "100us"
62-
config NET_GPTP_CLOCK_ACCURACY_250US
63-
bool "250us"
64-
config NET_GPTP_CLOCK_ACCURACY_1MS
65-
bool "1ms"
66-
config NET_GPTP_CLOCK_ACCURACY_2_5MS
67-
bool "1.5ms"
68-
config NET_GPTP_CLOCK_ACCURACY_10MS
69-
bool "10ms"
70-
config NET_GPTP_CLOCK_ACCURACY_25MS
71-
bool "25ms"
72-
config NET_GPTP_CLOCK_ACCURACY_100MS
73-
bool "100ms"
74-
config NET_GPTP_CLOCK_ACCURACY_250MS
75-
bool "250ms"
76-
config NET_GPTP_CLOCK_ACCURACY_1S
77-
bool "1s"
78-
config NET_GPTP_CLOCK_ACCURACY_10S
79-
bool "10s"
80-
config NET_GPTP_CLOCK_ACCURACY_GT_10S
81-
bool "> 10s"
44+
config NET_GPTP_CLOCK_ACCURACY_UNKNOWN
45+
bool "Unknown"
46+
47+
config NET_GPTP_CLOCK_ACCURACY_25NS
48+
bool "25ns"
49+
50+
config NET_GPTP_CLOCK_ACCURACY_100NS
51+
bool "100ns"
52+
53+
config NET_GPTP_CLOCK_ACCURACY_250NS
54+
bool "250ns"
55+
56+
config NET_GPTP_CLOCK_ACCURACY_1US
57+
bool "1us"
58+
59+
config NET_GPTP_CLOCK_ACCURACY_2_5US
60+
bool "2.5us"
61+
62+
config NET_GPTP_CLOCK_ACCURACY_10US
63+
bool "10us"
64+
65+
config NET_GPTP_CLOCK_ACCURACY_25US
66+
bool "25us"
67+
68+
config NET_GPTP_CLOCK_ACCURACY_100US
69+
bool "100us"
70+
71+
config NET_GPTP_CLOCK_ACCURACY_250US
72+
bool "250us"
73+
74+
config NET_GPTP_CLOCK_ACCURACY_1MS
75+
bool "1ms"
76+
77+
config NET_GPTP_CLOCK_ACCURACY_2_5MS
78+
bool "1.5ms"
79+
80+
config NET_GPTP_CLOCK_ACCURACY_10MS
81+
bool "10ms"
82+
83+
config NET_GPTP_CLOCK_ACCURACY_25MS
84+
bool "25ms"
85+
86+
config NET_GPTP_CLOCK_ACCURACY_100MS
87+
bool "100ms"
88+
89+
config NET_GPTP_CLOCK_ACCURACY_250MS
90+
bool "250ms"
91+
92+
config NET_GPTP_CLOCK_ACCURACY_1S
93+
bool "1s"
94+
95+
config NET_GPTP_CLOCK_ACCURACY_10S
96+
bool "10s"
97+
98+
config NET_GPTP_CLOCK_ACCURACY_GT_10S
99+
bool "> 10s"
100+
82101
endchoice
83102

84103
config NET_GPTP_CLOCK_ACCURACY

subsys/net/lib/config/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ if NET_CONFIG_SETTINGS
2424

2525
config NET_CONFIG_AUTO_INIT
2626
bool "Init networking support automatically during device startup"
27-
default n if USB_DEVICE_NETWORK || USBD_CDC_ECM_CLASS || USBD_CDC_NCM_CLASS
28-
default y
27+
default y if !(USB_DEVICE_NETWORK || USBD_CDC_ECM_CLASS || USBD_CDC_NCM_CLASS)
2928
help
3029
If this option is set, then the networking system is automatically
3130
initialized when the device is started. If you do not wish to do

subsys/net/lib/lwm2m/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ config LWM2M_ENGINE_ALWAYS_REPORT_OBJ_VERSION
143143
always report all object versions.
144144

145145
choice
146-
prompt "Socket handling at idle state"
146+
prompt "Socket handling at idle state"
147147

148148
config LWM2M_RD_CLIENT_CLOSE_SOCKET_AT_IDLE
149149
bool "Close socket when entering RX idle"

subsys/net/lib/mqtt_sn/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ config MQTT_SN_LIB_MAX_ADDR_SIZE
4141
default 21
4242
range 1 $(UINT8_MAX)
4343
help
44-
The MQTT_SN library stores addresses internally and thus
45-
needs to know how long your addresses are. Set this to the maximum
46-
length in bytes of the address data structure for your implemented transport.
44+
The MQTT_SN library stores addresses internally and thus
45+
needs to know how long your addresses are. Set this to the maximum
46+
length in bytes of the address data structure for your implemented transport.
4747

4848
config MQTT_SN_LIB_BROADCAST_RADIUS
4949
int "Radius for broadcast messages"

subsys/net/lib/ptp/Kconfig

Lines changed: 82 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,18 @@ choice
5555
help
5656
Specifies type of PTP Clock implemented on the target device
5757

58-
config PTP_ORDINARY_CLOCK
59-
bool "Ordinary Clock"
58+
config PTP_ORDINARY_CLOCK
59+
bool "Ordinary Clock"
6060

61-
config PTP_BOUNDARY_CLOCK
62-
bool "Boundary Clock"
61+
config PTP_BOUNDARY_CLOCK
62+
bool "Boundary Clock"
6363

64-
config PTP_TRANSPARENT_P2P_CLOCK
65-
bool "Transparent Peer-to-Peer Clock"
64+
config PTP_TRANSPARENT_P2P_CLOCK
65+
bool "Transparent Peer-to-Peer Clock"
66+
67+
config PTP_TRANSPARENT_E2E_CLOCK
68+
bool "Transparent End-to-End Clock"
6669

67-
config PTP_TRANSPARENT_E2E_CLOCK
68-
bool "Transparent End-to-End Clock"
6970
endchoice
7071

7172
config PTP_CLOCK_TYPE
@@ -89,15 +90,16 @@ choice
8990
prompt "PTP Networking Protocol used by PTP Stack"
9091
default PTP_UDP_IPv4_PROTOCOL
9192

92-
config PTP_UDP_IPv4_PROTOCOL
93-
bool "UDP with IPv4"
94-
depends on NET_IPV4
95-
select NET_IPV4_IGMP
93+
config PTP_UDP_IPv4_PROTOCOL
94+
bool "UDP with IPv4"
95+
depends on NET_IPV4
96+
select NET_IPV4_IGMP
97+
98+
config PTP_UDP_IPv6_PROTOCOL
99+
bool "UDP with IPv6"
100+
depends on NET_IPV6
101+
select NET_IPV6_MLD
96102

97-
config PTP_UDP_IPv6_PROTOCOL
98-
bool "UDP with IPv6"
99-
depends on NET_IPV6
100-
select NET_IPV6_MLD
101103
endchoice
102104

103105
choice
@@ -108,44 +110,63 @@ choice
108110
the actual capabilities of the hardware.
109111
See 7.6.2.5 of IEEE 1588-2019 for more info.
110112

111-
config PTP_CLOCK_ACCURACY_UNKNOWN
112-
bool "Unknown"
113-
config PTP_CLOCK_ACCURACY_25NS
114-
bool "25ns"
115-
config PTP_CLOCK_ACCURACY_100NS
116-
bool "100ns"
117-
config PTP_CLOCK_ACCURACY_250NS
118-
bool "250ns"
119-
config PTP_CLOCK_ACCURACY_1US
120-
bool "1us"
121-
config PTP_CLOCK_ACCURACY_2_5US
122-
bool "2.5us"
123-
config PTP_CLOCK_ACCURACY_10US
124-
bool "10us"
125-
config PTP_CLOCK_ACCURACY_25US
126-
bool "25us"
127-
config PTP_CLOCK_ACCURACY_100US
128-
bool "100us"
129-
config PTP_CLOCK_ACCURACY_250US
130-
bool "250us"
131-
config PTP_CLOCK_ACCURACY_1MS
132-
bool "1ms"
133-
config PTP_CLOCK_ACCURACY_2_5MS
134-
bool "1.5ms"
135-
config PTP_CLOCK_ACCURACY_10MS
136-
bool "10ms"
137-
config PTP_CLOCK_ACCURACY_25MS
138-
bool "25ms"
139-
config PTP_CLOCK_ACCURACY_100MS
140-
bool "100ms"
141-
config PTP_CLOCK_ACCURACY_250MS
142-
bool "250ms"
143-
config PTP_CLOCK_ACCURACY_1S
144-
bool "1s"
145-
config PTP_CLOCK_ACCURACY_10S
146-
bool "10s"
147-
config PTP_CLOCK_ACCURACY_GT_10S
148-
bool "> 10s"
113+
config PTP_CLOCK_ACCURACY_UNKNOWN
114+
bool "Unknown"
115+
116+
config PTP_CLOCK_ACCURACY_25NS
117+
bool "25ns"
118+
119+
config PTP_CLOCK_ACCURACY_100NS
120+
bool "100ns"
121+
122+
config PTP_CLOCK_ACCURACY_250NS
123+
bool "250ns"
124+
125+
config PTP_CLOCK_ACCURACY_1US
126+
bool "1us"
127+
128+
config PTP_CLOCK_ACCURACY_2_5US
129+
bool "2.5us"
130+
131+
config PTP_CLOCK_ACCURACY_10US
132+
bool "10us"
133+
134+
config PTP_CLOCK_ACCURACY_25US
135+
bool "25us"
136+
137+
config PTP_CLOCK_ACCURACY_100US
138+
bool "100us"
139+
140+
config PTP_CLOCK_ACCURACY_250US
141+
bool "250us"
142+
143+
config PTP_CLOCK_ACCURACY_1MS
144+
bool "1ms"
145+
146+
config PTP_CLOCK_ACCURACY_2_5MS
147+
bool "1.5ms"
148+
149+
config PTP_CLOCK_ACCURACY_10MS
150+
bool "10ms"
151+
152+
config PTP_CLOCK_ACCURACY_25MS
153+
bool "25ms"
154+
155+
config PTP_CLOCK_ACCURACY_100MS
156+
bool "100ms"
157+
158+
config PTP_CLOCK_ACCURACY_250MS
159+
bool "250ms"
160+
161+
config PTP_CLOCK_ACCURACY_1S
162+
bool "1s"
163+
164+
config PTP_CLOCK_ACCURACY_10S
165+
bool "10s"
166+
167+
config PTP_CLOCK_ACCURACY_GT_10S
168+
bool "> 10s"
169+
149170
endchoice
150171

151172
config PTP_CLOCK_ACCURACY
@@ -248,7 +269,6 @@ config PTP_PRE_TIME_TRANSMITTER_PRESENT
248269

249270
config PTP_UNCALIBRATED_PRESENT
250271
bool
251-
default n
252272

253273
config PTP_FOREIGN_TIME_TRANSMITTER_FEATURE
254274
bool
@@ -268,14 +288,15 @@ choice PTP_DSCP_PRIORITY
268288
prompt "Priority of PTP packets classification"
269289
default PTP_DSCP_NONE_PRIORITY
270290

271-
config PTP_DSCP_HIGH_PRIORITY
272-
bool "High priority of PTP packet classification"
291+
config PTP_DSCP_HIGH_PRIORITY
292+
bool "High priority of PTP packet classification"
293+
294+
config PTP_DSCP_MEDIUM_PRIORITY
295+
bool "Medium priority of PTP packet classification"
273296

274-
config PTP_DSCP_MEDIUM_PRIORITY
275-
bool "Medium priority of PTP packet classification"
297+
config PTP_DSCP_NONE_PRIORITY
298+
bool "Default priority of PTP packet classification"
276299

277-
config PTP_DSCP_NONE_PRIORITY
278-
bool "Default priority of PTP packet classification"
279300
endchoice
280301

281302
config PTP_DSCP_VALUE

subsys/net/lib/sockets/Kconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ config NET_SOCKETS_TLS_MAX_APP_PROTOCOLS
236236
By default, no supported application layer protocol is set.
237237

238238
config NET_SOCKETS_TLS_MAX_CLIENT_SESSION_COUNT
239-
int "Maximum number of stored client TLS/DTLS sessions"
240-
default 1
241-
depends on NET_SOCKETS_SOCKOPT_TLS
242-
help
243-
This variable specifies maximum number of stored TLS/DTLS sessions,
244-
used for TLS/DTLS session resumption.
239+
int "Maximum number of stored client TLS/DTLS sessions"
240+
default 1
241+
depends on NET_SOCKETS_SOCKOPT_TLS
242+
help
243+
This variable specifies maximum number of stored TLS/DTLS sessions,
244+
used for TLS/DTLS session resumption.
245245

246246
config NET_SOCKETS_TLS_CERT_VERIFY_CALLBACK
247247
bool "TLS certificate verification callback support"

0 commit comments

Comments
 (0)