From e5f93f856dc1ebba9045ab65870812590818fbc4 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Mon, 30 May 2022 10:39:06 +0200 Subject: [PATCH 1/2] gnrc: gnrc_netif etc. modules are not required by gnrc_netif_pktq --- sys/net/gnrc/Makefile.dep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/gnrc/Makefile.dep b/sys/net/gnrc/Makefile.dep index 24062f12ef..50eb101f24 100644 --- a/sys/net/gnrc/Makefile.dep +++ b/sys/net/gnrc/Makefile.dep @@ -455,7 +455,7 @@ ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE))) endif endif -ifneq (,$(filter gnrc_netif_%,$(USEMODULE))) +ifneq (,$(filter gnrc_netif_%,$(filter-out gnrc_netif_pktq,$(USEMODULE)))) USEMODULE += gnrc_netif USEMODULE += core_thread_flags USEMODULE += event From e22fb6ef0752ac6d7a9302a5d1175ad6df76ffbb Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Mon, 30 May 2022 11:13:52 +0200 Subject: [PATCH 2/2] gnrc_netif_pktq: create dedicated Kconfig Reflects dependency change in e5f93f856dc1ebba9045ab65870812590818fbc4 --- sys/net/gnrc/netif/Kconfig | 15 ++------------- sys/net/gnrc/netif/pktq/Kconfig | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 sys/net/gnrc/netif/pktq/Kconfig diff --git a/sys/net/gnrc/netif/Kconfig b/sys/net/gnrc/netif/Kconfig index 481e425e94..27570d65dd 100644 --- a/sys/net/gnrc/netif/Kconfig +++ b/sys/net/gnrc/netif/Kconfig @@ -49,19 +49,6 @@ config GNRC_NETIF_NONSTANDARD_6LO_MTU This is non compliant with RFC 4944 and RFC 7668 and might not be supported by other implementations. -config GNRC_NETIF_PKTQ_POOL_SIZE - int "Packet queue pool size for all network interfaces" - depends on USEMODULE_GNRC_NETIF_PKTQ - default 16 - -config GNRC_NETIF_PKTQ_TIMER_US - int "Time in microseconds for when to try to send a queued packet at the latest" - depends on USEMODULE_GNRC_NETIF_PKTQ - default 5000 - help - Set to -1 to deactivate dequeing by timer. For this it has to be ensured - that none of the notifications by the driver are missed! - config GNRC_NETIF_LORAWAN_NETIF_HDR bool "Encode LoRaWAN port in GNRC netif header" depends on USEMODULE_GNRC_LORAWAN @@ -83,3 +70,5 @@ config GNRC_NETIF_IPV6_BR_AUTO_6CTX by prefix deligation at the border router. endif # KCONFIG_USEMODULE_GNRC_NETIF + +rsource "pktq/Kconfig" diff --git a/sys/net/gnrc/netif/pktq/Kconfig b/sys/net/gnrc/netif/pktq/Kconfig new file mode 100644 index 0000000000..ced468dafa --- /dev/null +++ b/sys/net/gnrc/netif/pktq/Kconfig @@ -0,0 +1,20 @@ +menuconfig KCONFIG_USEMODULE_GNRC_NETIF_PKTQ + bool "Configure packet queues for GNRC network interface" + depends on USEMODULE_GNRC_NETIF_PKTQ + help + Configure packet queues for GNRC network interface using Kconfig. + +if KCONFIG_USEMODULE_GNRC_NETIF_PKTQ +config GNRC_NETIF_PKTQ_POOL_SIZE + int "Packet queue pool size for all network interfaces" + depends on USEMODULE_GNRC_NETIF_PKTQ + default 16 + +config GNRC_NETIF_PKTQ_TIMER_US + int "Time in microseconds for when to try to send a queued packet at the latest" + depends on USEMODULE_GNRC_NETIF_PKTQ + default 5000 + help + Set to -1 to deactivate dequeing by timer. For this it has to be ensured + that none of the notifications by the driver are missed! +endif # KCONFIG_USEMODULE_GNRC_NETIF_PKTQ