- gerrit-log - lists.osmocom.org

[XS] Change in dahdi-linux[master]: dahdi-base: Use strncpy instead of strncat for beginning of buffer
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42000?usp=email ) Change subject: dahdi-base: Use strncpy instead of strncat for beginning of buffer ...................................................................... dahdi-base: Use strncpy instead of strncat for beginning of buffer This fixes a build failure I observe with kernel v6.2: from dahdi-linux/drivers/dahdi/dahdi-base.c:40: ./include/linux/fortify-string.h:388:32: note: expected ‘char *’ but argument is of type ‘long unsigned int’ 388 | char *strncat(char * const POS p, const char * const POS q, __kernel_size_t count) | ~~~~~~~~~~~~~~~~~^ make[2]: *** [scripts/Makefile.build:252: dahdi-linux/drivers/dahdi/dahdi-base.o] Error 1 Change-Id: I539167b46f265d3c8e6dc52c978f39d58c37405f --- M drivers/dahdi/dahdi-base.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/00/42000/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 6411e52..a0238e6 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -5449,7 +5449,7 @@ */ continue; } - strncat(vi.echo_canceller, ec_name, space); + strncpy(vi.echo_canceller, ec_name, space); space -= strlen(ec_name); if (space < 1) break; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42000?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I539167b46f265d3c8e6dc52c978f39d58c37405f Gerrit-Change-Number: 42000 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: wctdb24xxp/xhfc.c: Fix uninitialized variable
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42001?usp=email ) Change subject: wctdb24xxp/xhfc.c: Fix uninitialized variable ...................................................................... wctdb24xxp/xhfc.c: Fix uninitialized variable This fixes a compiler error when building for kernel v6.2: In function ‘xhfc_getreg’, inlined from ‘b400m_probe’ at dahdi-linux/drivers/dahdi/wctdm24xxp/xhfc.c:2563:7: dahdi-linux/drivers/dahdi/wctdm24xxp/xhfc.c:624:12: error: ‘x’ is used uninitialized [-Werror=uninitialized] 624 | if (*lastreg != (unsigned char)addr) { | ^ dahdi-linux/drivers/dahdi/wctdm24xxp/xhfc.c: In function ‘b400m_probe’: dahdi-linux/drivers/dahdi/wctdm24xxp/xhfc.c:2557:27: note: ‘x’ was declared here 2557 | unsigned char id, x; | ^ Change-Id: I49ca7825ab238333b7d55b0ce5cae5e9e92a2cfb --- M drivers/dahdi/wctdm24xxp/xhfc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/01/42001/1 diff --git a/drivers/dahdi/wctdm24xxp/xhfc.c b/drivers/dahdi/wctdm24xxp/xhfc.c index d37fbd5..3fd2a96 100644 --- a/drivers/dahdi/wctdm24xxp/xhfc.c +++ b/drivers/dahdi/wctdm24xxp/xhfc.c @@ -2554,7 +2554,7 @@ static int b400m_probe(struct wctdm *wc, int modpos) { - unsigned char id, x; + unsigned char id, x = 0; struct b400m *b4; unsigned long flags; int chiprev; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42001?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I49ca7825ab238333b7d55b0ce5cae5e9e92a2cfb Gerrit-Change-Number: 42001 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: dahdi_base.c: Avoid unnecessary strlen call when with strncat.
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/41999?usp=email ) Change subject: dahdi_base.c: Avoid unnecessary strlen call when with strncat. ...................................................................... dahdi_base.c: Avoid unnecessary strlen call when with strncat. It is not necessary to call strlen on the destination buffer when calling strncat. Resolves: #89 Change-Id: Idd3e6145682e276abb9bc67029df974197bf8b1b --- M drivers/dahdi/dahdi-base.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/99/41999/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 0aa1de7..6411e52 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -5449,14 +5449,12 @@ */ continue; } - strncat(vi.echo_canceller + strlen(vi.echo_canceller), - ec_name, space); + strncat(vi.echo_canceller, ec_name, space); space -= strlen(ec_name); if (space < 1) break; if (cur->list.next && (cur->list.next != &ecfactory_list)) { - strncat(vi.echo_canceller + strlen(vi.echo_canceller), - ", ", space); + strncat(vi.echo_canceller, ", ", space); space -= 2; if (space < 1) break; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/41999?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idd3e6145682e276abb9bc67029df974197bf8b1b Gerrit-Change-Number: 41999 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: dahdi_dummy: Use hrtimer_setup on kernels >= 6.15.0.
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42004?usp=email ) Change subject: dahdi_dummy: Use hrtimer_setup on kernels >= 6.15.0. ...................................................................... dahdi_dummy: Use hrtimer_setup on kernels >= 6.15.0. Kernel commit 908a1d775422ba2e27a5e33d0c130b522419e121 introduced hrtimer_setup to eventually replace hrtimer_init, which was done in kernel commit 9779489a31d77a7b9cb6f20d2d2caced4e29dbe6. Accordingly, we now use the new setup process on newer kernels. Resolves: #93 Change-Id: Ied0bdb1e32c30cff9208fd181efe7f494e230964 --- M drivers/dahdi/dahdi_dummy.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/04/42004/1 diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index b1004d9..44cd3ba 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -229,12 +229,14 @@ #if defined(USE_HIGHRESTIMER) printk(KERN_DEBUG "dahdi_dummy: Trying to load High Resolution Timer\n"); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0) + hrtimer_setup(&zaptimer, dahdi_dummy_hr_int, CLOCK_MONOTONIC, HRTIMER_MODE_REL); +#else hrtimer_init(&zaptimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - printk(KERN_DEBUG "dahdi_dummy: Initialized High Resolution Timer\n"); - /* Set timer callback function */ zaptimer.function = dahdi_dummy_hr_int; - +#endif /* LINUX_VERSION_CODE */ + printk(KERN_DEBUG "dahdi_dummy: Initialized High Resolution Timer\n"); printk(KERN_DEBUG "dahdi_dummy: Starting High Resolution Timer\n"); hrtimer_start(&zaptimer, ktime_set(0, DAHDI_TIME_NS), HRTIMER_MODE_REL); printk(KERN_INFO "dahdi_dummy: High Resolution Timer started, good to go\n"); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42004?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ied0bdb1e32c30cff9208fd181efe7f494e230964 Gerrit-Change-Number: 42004 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[M] Change in dahdi-linux[master]: disable loader for the hardware echo canceller as it breaks on >= 6.15
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42002?usp=email ) Change subject: disable loader for the hardware echo canceller as it breaks on >= 6.15 ...................................................................... disable loader for the hardware echo canceller as it breaks on >= 6.15 Temporary disable loader for the hardware echo canceler on systems with modern kernels. Since Kernel 6.15 (https://github.com/torvalds/linux/commit/0b10177114d1e434af850b377cf5e6620d…) all objtool failures are fatal and linking dahdi_vpmadt032_loader.o fails: https: //github.com/asterisk/dahdi-linux/issues/80 https: //github.com/asterisk/dahdi-linux/issues/97 Change-Id: I85ca443e98ce7f289a9207172407ca03cead8e90 --- M drivers/dahdi/Kbuild 1 file changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/02/42002/1 diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 4d05f12..48a4d58 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -135,40 +135,40 @@ # VPMADT032 Loader ############################################################################### -dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o - -ifneq ($(DAHDI_ARCH),) - ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),) - $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd) - VPMADT032_LOADER_PRESENT=yes - dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o - endif -endif - -# FIXME: This workaround should not be necessary, but for some reason the rule -# '$(obj)/%: $(src)/%_shipped' from linux.git scripts/Makefile.lib doesn't -# cover this anymore. -vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o: $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped - $(call cmd,copy) - +#dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o +# +#ifneq ($(DAHDI_ARCH),) +# ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),) +# $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd) +# VPMADT032_LOADER_PRESENT=yes +# dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o +# obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o +# endif +#endif +# +## FIXME: This workaround should not be necessary, but for some reason the rule +## '$(obj)/%: $(src)/%_shipped' from linux.git scripts/Makefile.lib doesn't +## cover this anymore. +#vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o: $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped +# $(call cmd,copy) +# ############################################################################### # HPEC Support ############################################################################### - -dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o -CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec - -ifneq ($(DAHDI_ARCH),) - ifneq ($(wildcard $(src)/hpec/hpec_$(DAHDI_ARCH).o_shipped),) - HPEC_PRESENT=yes - dahdi_echocan_hpec-objs += hpec/hpec_$(DAHDI_ARCH).o - endif -endif - -ifeq ($(HPEC_PRESENT),yes) -obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC) += dahdi_echocan_hpec.o -endif +# +#dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o +#CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec +# +#ifneq ($(DAHDI_ARCH),) +# ifneq ($(wildcard $(src)/hpec/hpec_$(DAHDI_ARCH).o_shipped),) +# HPEC_PRESENT=yes +# dahdi_echocan_hpec-objs += hpec/hpec_$(DAHDI_ARCH).o +# endif +#endif +# +#ifeq ($(HPEC_PRESENT),yes) +#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC) += dahdi_echocan_hpec.o +#endif hostprogs-y := makefw -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I85ca443e98ce7f289a9207172407ca03cead8e90 Gerrit-Change-Number: 42002 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: dahdi_dummy: Use module_init/module_exit instead of init_module/clean...
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42007?usp=email ) Change subject: dahdi_dummy: Use module_init/module_exit instead of init_module/cleanup_module. ...................................................................... dahdi_dummy: Use module_init/module_exit instead of init_module/cleanup_module. Since kernel commit 4fab2d7628dd38f3fa8a5e615199350ecaeb17a8, building dahdi_dummy fails with an objtool failure since init_module/cleanup_module are deprecated. Update dahdi_dummy to use module_init and module_exit, just like all other modules. Resolves: #94 Change-Id: I6746e4778b850b19f5c5bc37b81f5b528b0e1713 --- M drivers/dahdi/dahdi_dummy.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/07/42007/1 diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 44cd3ba..611ba0f 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -209,7 +209,7 @@ return res; } -int init_module(void) +static int __init dummy_init(void) { int res; ztd = kzalloc(sizeof(*ztd), GFP_KERNEL); @@ -252,8 +252,7 @@ return 0; } - -void cleanup_module(void) +static void __exit dummy_exit(void) { #if defined(USE_HIGHRESTIMER) /* Stop high resolution timer */ @@ -274,3 +273,6 @@ MODULE_DESCRIPTION("Timing-Only Driver"); MODULE_AUTHOR("Robert Pleh <robert.pleh(a)hermes.si>"); MODULE_LICENSE("GPL v2"); + +module_init(dummy_init); +module_exit(dummy_exit); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I6746e4778b850b19f5c5bc37b81f5b528b0e1713 Gerrit-Change-Number: 42007 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: kernel.h: Add wrappers for del_timer and del_timer_sync.
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42005?usp=email ) Change subject: kernel.h: Add wrappers for del_timer and del_timer_sync. ...................................................................... kernel.h: Add wrappers for del_timer and del_timer_sync. del_timer[_sync] was renamed to timer_delete[_sync] in kernel commit bb663f0f3c396c6d05f6c5eeeea96ced20ff112e, and the compatibility wrappers were removed completely in kernel commit 8fa7292fee5c5240402371ea89ab285ec856c916. Add the wrappers back on newer kernels to allow compilation. Resolves: #91 Change-Id: I71daee0fb678ed27c7764b7a6fe30c8bab762418 --- M include/dahdi/kernel.h 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/05/42005/1 diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index b707753..1756aaf 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -77,6 +77,11 @@ #define PDE_DATA(i) pde_data(i) #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) +#define del_timer timer_delete +#define del_timer_sync timer_delete_sync +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) #include <linux/dma-mapping.h> static inline void * -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42005?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I71daee0fb678ed27c7764b7a6fe30c8bab762418 Gerrit-Change-Number: 42005 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[S] Change in dahdi-linux[master]: Kbuild: Use ccflags-y instead of EXTRA_CFLAGS.
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42003?usp=email ) Change subject: Kbuild: Use ccflags-y instead of EXTRA_CFLAGS. ...................................................................... Kbuild: Use ccflags-y instead of EXTRA_CFLAGS. ccflags-y was added to the kernel back in 2007, in commit f77bf01425b11947eeb3b5b54. Recent kernel commit dbd83ea09699390892e5efecddd74ae43a00f071 has now completely removed the deprecated EXTRA_CFLAGS. Comments in Kbuild and the Makefile for the oct612x library were added back when it was created in 2013 in commit f65299e8b2e6ffb0b07089759f8c4ff33a695c09 to use the newer ccflags-y based on the kernel version, but the change was never made to conditionally move away from the EXTRA_CFLAGS. Now that the older way no longer exists, always use ccflags-y. Resolves: #76 Change-Id: Ia08fe7d84a554c87624a186fc23316bfaf3edb5c --- M drivers/dahdi/Kbuild M drivers/dahdi/oct612x/Kbuild M drivers/dahdi/oct612x/Makefile M drivers/dahdi/voicebus/Kbuild M drivers/dahdi/wcb4xxp/Kbuild M drivers/dahdi/wct4xxp/Kbuild M drivers/dahdi/wctc4xxp/Kbuild M drivers/dahdi/wctdm24xxp/Kbuild M drivers/dahdi/wcte12xp/Kbuild M drivers/dahdi/xpp/Kbuild 10 files changed, 16 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/03/42003/1 diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 48a4d58..c845d56 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -86,13 +86,13 @@ BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2 BAD_KERNELS := $(foreach ver,$(BAD_KERNELS_VERS),2.6.9-$(ver).EL 2.6.9-$(ver).ELsmp) ifneq (,$(filter $(KVERS),$(BAD_KERNELS))) -EXTRA_CFLAGS+=-Drw_lock_t=rwlock_t +ccflags-y+=-Drw_lock_t=rwlock_t endif # A number of Fedora 10 (9 also?) kernels backported hrtimer to 2.6.27 # as part of an ALSA backport. TODO: Any better way to detect that? ifeq (1,$(shell fgrep -q ' hrtimer_set_expires' include/linux/hrtimer.h 2>/dev/null && echo 1)) -EXTRA_CFLAGS+=-DHAVE_HRTIMER_ACCESSORS=1 +ccflags-y+=-DHAVE_HRTIMER_ACCESSORS=1 endif ifeq (1,$(shell fgrep -q 'wait_for_completion_timeout' include/linux/completion.h 2>/dev/null && echo 1)) diff --git a/drivers/dahdi/oct612x/Kbuild b/drivers/dahdi/oct612x/Kbuild index ac53fe7..5015f7e 100644 --- a/drivers/dahdi/oct612x/Kbuild +++ b/drivers/dahdi/oct612x/Kbuild @@ -24,9 +24,6 @@ apilib/llman/octapi_llman.o \ oct612x-user.o -# TODO: ccflags was added in 2.6.24 in commit f77bf01425b11947eeb3b5b54. This -# should be changed to a conditional compilation based on the Kernel Version. -# ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api -EXTRA_CFLAGS = -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api +ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OCT612X) := oct612x.o oct612x-objs := $(octapi_files) diff --git a/drivers/dahdi/oct612x/Makefile b/drivers/dahdi/oct612x/Makefile index 5d29143..d01997b 100644 --- a/drivers/dahdi/oct612x/Makefile +++ b/drivers/dahdi/oct612x/Makefile @@ -23,8 +23,5 @@ apilib/largmath/octapi_largmath.o \ apilib/llman/octapi_llman.o -# TODO: ccflags was added in 2.6.24 in commit f77bf01425b11947eeb3b5b54. This -# should be changed to a conditional compilation based on the Kernel Version. -# ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api -EXTRA_CFLAGS = -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api +ccflags-y := -I$(src)/.. -Wno-undef -I$(src)/include -I$(src)/octdeviceapi -I$(src)/octdeviceapi/oct6100api lib-y := $(octapi_files) diff --git a/drivers/dahdi/voicebus/Kbuild b/drivers/dahdi/voicebus/Kbuild index 3bf9640..45026d9 100644 --- a/drivers/dahdi/voicebus/Kbuild +++ b/drivers/dahdi/voicebus/Kbuild @@ -8,10 +8,10 @@ dahdi_voicebus-objs += $(FIRM_DIR)/dahdi-fw-vpmoct032.o $(warning WARNING: You are compiling firmware into voicebus.ko which is not available under the terms of the GPL. It may be a violation of the GPL to distribute the resulting image since it combines both GPL and non-GPL work. You should consult a lawyer of your own before distributing such an image.) else - EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE + ccflags-y+=-DHOTPLUG_FIRMWARE endif -EXTRA_CFLAGS += -I$(src)/.. -Wno-undef +ccflags-y += -I$(src)/.. -Wno-undef $(obj)/$(FIRM_DIR)/dahdi-fw-vpmoct032.o: $(obj)/voicebus.o $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-vpmoct032.o diff --git a/drivers/dahdi/wcb4xxp/Kbuild b/drivers/dahdi/wcb4xxp/Kbuild index 80606bf..59ffc8d 100644 --- a/drivers/dahdi/wcb4xxp/Kbuild +++ b/drivers/dahdi/wcb4xxp/Kbuild @@ -1,6 +1,6 @@ obj-m += wcb4xxp.o -EXTRA_CFLAGS += -I$(src)/.. -Wno-undef +ccflags-y += -I$(src)/.. -Wno-undef wcb4xxp-objs := base.o diff --git a/drivers/dahdi/wct4xxp/Kbuild b/drivers/dahdi/wct4xxp/Kbuild index cf01ccf..eeeb2f6 100644 --- a/drivers/dahdi/wct4xxp/Kbuild +++ b/drivers/dahdi/wct4xxp/Kbuild @@ -2,16 +2,16 @@ FIRM_DIR := ../firmware -EXTRA_CFLAGS += -I$(src)/.. -I$(src)/../oct612x/ $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef +ccflags-y += -I$(src)/.. -I$(src)/../oct612x/ $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef # The OCT612X source files are from a vendor drop and we do not want to edit # them to make this warning go away. Therefore, turn off the # unused-but-set-variable warning for this driver. -EXTRA_CFLAGS += $(call cc-option, -Wno-unused-but-set-variable) +ccflags-y += $(call cc-option, -Wno-unused-but-set-variable) ifeq ($(HOTPLUG_FIRMWARE),yes) - EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE + ccflags-y+=-DHOTPLUG_FIRMWARE endif wct4xxp-objs := base.o vpm450m.o diff --git a/drivers/dahdi/wctc4xxp/Kbuild b/drivers/dahdi/wctc4xxp/Kbuild index 9f97498..2f1bfbf 100644 --- a/drivers/dahdi/wctc4xxp/Kbuild +++ b/drivers/dahdi/wctc4xxp/Kbuild @@ -2,10 +2,10 @@ FIRM_DIR := ../firmware -EXTRA_CFLAGS += -I$(src)/.. -Wno-undef +ccflags-y += -I$(src)/.. -Wno-undef ifeq ($(HOTPLUG_FIRMWARE),yes) - EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE + ccflags-y+=-DHOTPLUG_FIRMWARE endif wctc4xxp-objs := base.o diff --git a/drivers/dahdi/wctdm24xxp/Kbuild b/drivers/dahdi/wctdm24xxp/Kbuild index 22cc71a..c9d96b7 100644 --- a/drivers/dahdi/wctdm24xxp/Kbuild +++ b/drivers/dahdi/wctdm24xxp/Kbuild @@ -1,5 +1,5 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp.o -EXTRA_CFLAGS += -I$(src)/.. -Wno-undef +ccflags-y += -I$(src)/.. -Wno-undef wctdm24xxp-objs := base.o xhfc.o diff --git a/drivers/dahdi/wcte12xp/Kbuild b/drivers/dahdi/wcte12xp/Kbuild index 77efd7d..ace7c4d 100644 --- a/drivers/dahdi/wcte12xp/Kbuild +++ b/drivers/dahdi/wcte12xp/Kbuild @@ -1,5 +1,5 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp.o -EXTRA_CFLAGS += -I$(src)/.. -Wno-undef +ccflags-y += -I$(src)/.. -Wno-undef wcte12xp-objs := base.o diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild index 2965af0..9f2b6d6 100644 --- a/drivers/dahdi/xpp/Kbuild +++ b/drivers/dahdi/xpp/Kbuild @@ -1,4 +1,4 @@ -EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ +ccflags-y = $(XPP_LOCAL_CFLAGS) \ -DDEBUG \ -DPOLL_DIGITAL_INPUTS \ -DDEBUG_PCMTX \ @@ -32,7 +32,7 @@ xpp_mmap-objs += mmapbus.o mmapdrv.o ifeq (y,$(PARPORT_DEBUG)) -EXTRA_CFLAGS += -DDEBUG_SYNC_PARPORT +ccflags-y += -DDEBUG_SYNC_PARPORT obj-m += parport_debug.o endif -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42003?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ia08fe7d84a554c87624a186fc23316bfaf3edb5c Gerrit-Change-Number: 42003 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in dahdi-linux[master]: kernel.h: Add wrapper for renamed from_timer function.
by laforge 01 Feb '26

01 Feb '26

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42006?usp=email ) Change subject: kernel.h: Add wrapper for renamed from_timer function. ...................................................................... kernel.h: Add wrapper for renamed from_timer function. from_timer was renamed to timer_container_of in kernel commit 41cb08555c4164996d67c78b3bf1c658075b75f1 as part of updates to the timer APIs. Add a compatibility wrapper for kernels >= 6.16.0. Resolves: #95 Change-Id: I9d7e075f30cf041f266ac42d0a656f7aee5701cc --- M include/dahdi/kernel.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/06/42006/1 diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 1756aaf..47d92f5 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -77,6 +77,10 @@ #define PDE_DATA(i) pde_data(i) #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0) +#define from_timer timer_container_of +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0) #define del_timer timer_delete #define del_timer_sync timer_delete_sync -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I9d7e075f30cf041f266ac42d0a656f7aee5701cc Gerrit-Change-Number: 42006 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: http_json_api: Only require Content-Type if response body is non-empty
by laforge 31 Jan '26

31 Jan '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/41998?usp=email ) Change subject: http_json_api: Only require Content-Type if response body is non-empty ...................................................................... http_json_api: Only require Content-Type if response body is non-empty If there is an empty body returned, such as in the case of the response to an es9p notification, then it is of course also legal to not set the content-type header. This patch fixes an exception when talking to certain SM-DP+ with es9p_client.py: DEBUG:pySim.esim.http_json_api:HTTP RSP-STS: [204] hdr: {'X-Admin-Protocol': 'gsma/rsp/v2.5.0', 'Date': 'Wed, 28 Jan 2026 18:26:39 GMT', 'Server': 'REDACTED'} DEBUG:pySim.esim.http_json_api:HTTP RSP: b'' {'X-Admin-Protocol': 'gsma/rsp/v2.5.0', 'Date': 'Wed, 28 Jan 2026 18:26:39 GMT', 'Server': 'REDACTED'} <Response [204]> Traceback (most recent call last): File "gprojects/git/pysim/es9p/../contrib/es9p_client.py", line 315, in <module> c.do_notification() ~~~~~~~~~~~~~~~~~^^ File "projects/git/pysim/es9p/../contrib/es9p_client.py", line 159, in do_notification res = self.peer.call_handleNotification(data) File "projects/git/pysim/contrib/pySim/esim/es9p.py", line 174, in call_handleNotification return self.handleNotification.call(data) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^ File "projects/git/pysim/contrib/pySim/esim/http_json_api.py", line 335, in call if not response.headers.get('Content-Type').startswith(req_headers['Content-Type']): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AttributeError: 'NoneType' object has no attribute 'startswith' Change-Id: I99e8f167b7bb869c5ff6d908ba673dac87fef71a --- M pySim/esim/http_json_api.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/esim/http_json_api.py b/pySim/esim/http_json_api.py index e640b3f..36caac9 100644 --- a/pySim/esim/http_json_api.py +++ b/pySim/esim/http_json_api.py @@ -330,7 +330,7 @@ # SGP.22, section 6.5.1) if response.status_code != self.api_func.expected_http_status: raise HttpStatusError(response) - if not response.headers.get('Content-Type').startswith(req_headers['Content-Type']): + if response.content and not response.headers.get('Content-Type').startswith(req_headers['Content-Type']): raise HttpHeaderError(response) if not response.headers.get('X-Admin-Protocol', 'gsma/rsp/v2.unknown').startswith('gsma/rsp/v2.'): raise HttpHeaderError(response) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41998?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I99e8f167b7bb869c5ff6d908ba673dac87fef71a Gerrit-Change-Number: 41998 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log