- gerrit-log - lists.osmocom.org

Change in dahdi-linux[master]: dahdi-sysfs-chan: Fix potential NULL pointer deref
by laforge 25 Apr '22

25 Apr '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27912 ) Change subject: dahdi-sysfs-chan: Fix potential NULL pointer deref ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I4274e7a92ca6ee7e92c6adb713fb89ffe31b4c72 Gerrit-Change-Number: 27912 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 24 Apr 2022 17:44:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: wctc4xxp: Use __dev_addr_set() on kernels >= 5.15
by laforge 25 Apr '22

25 Apr '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27911 ) Change subject: wctc4xxp: Use __dev_addr_set() on kernels >= 5.15 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Id7b71164dfe7772b68e86cb12ac0e0974fec1498 Gerrit-Change-Number: 27911 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 24 Apr 2022 17:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: wctc4xxp: Use __dev_addr_set() on kernels >= 5.15
by laforge 25 Apr '22

25 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27911 ) Change subject: wctc4xxp: Use __dev_addr_set() on kernels >= 5.15 ...................................................................... wctc4xxp: Use __dev_addr_set() on kernels >= 5.15 The address list has been converted to a tree, so netdev->dev_addr is now const and must not be written directly. The __dev_addr_set helper can be used for this. Change-Id: Id7b71164dfe7772b68e86cb12ac0e0974fec1498 --- M drivers/dahdi/wctc4xxp/base.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/11/27911/1 diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 7ff3456..223bbbd 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -637,7 +637,11 @@ return -ENOMEM; priv = netdev_priv(netdev); priv->wc = wc; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) + __dev_addr_set(netdev, our_mac, sizeof(our_mac)); +#else memcpy(netdev->dev_addr, our_mac, sizeof(our_mac)); +#endif # ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &wctc4xxp_netdev_ops; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Id7b71164dfe7772b68e86cb12ac0e0974fec1498 Gerrit-Change-Number: 27911 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in dahdi-linux[master]: dahdi-sysfs-chan: Fix potential NULL pointer deref
by laforge 25 Apr '22

25 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27912 ) Change subject: dahdi-sysfs-chan: Fix potential NULL pointer deref ...................................................................... dahdi-sysfs-chan: Fix potential NULL pointer deref Sometimes it is useful to look at compiler warnings: dahdi-sysfs-chan.c:384:17: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] And indeed, we could have de-referenced a NULL pointer here. Change-Id: I4274e7a92ca6ee7e92c6adb713fb89ffe31b4c72 --- M drivers/dahdi/dahdi-sysfs-chan.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/12/27912/1 diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c index a91e6ed..8682ea3 100644 --- a/drivers/dahdi/dahdi-sysfs-chan.c +++ b/drivers/dahdi/dahdi-sysfs-chan.c @@ -381,10 +381,11 @@ return; for (i = 0; i < ARRAY_SIZE(fixed_minors); i++) { void *d = fixed_minors[i].dev; - if (d && !IS_ERR(d)) + if (d && !IS_ERR(d)) { dahdi_dbg(DEVICES, "Removing fixed device file %s\n", fixed_minors[i].name); DEL_DAHDI_DEV(fixed_minors[i].minor); + } } } -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I4274e7a92ca6ee7e92c6adb713fb89ffe31b4c72 Gerrit-Change-Number: 27912 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in dahdi-linux[master]: Fix -Wimplicit-fallthrough=5 warnings
by laforge 25 Apr '22

25 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27910 ) Change subject: Fix -Wimplicit-fallthrough=5 warnings ...................................................................... Fix -Wimplicit-fallthrough=5 warnings Modern Linux (since 5.4) builds with -Wimplicit-fallthrough=5. On some environments (notably Debian buster) this is even an error, so building dahdi-linux will fail. Let's add the proper 'fallthrough' annotation of linux/compiler_attributes.h and add a backwards-compatibility definition for older kernels. Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/wcaxx-base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/card_global.c M include/dahdi/kernel.h 5 files changed, 19 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 2b6256b..7bcbda6 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -7961,7 +7961,7 @@ memset(getlin, 0, DAHDI_CHUNKSIZE * sizeof(short)); txb[0] = DAHDI_LIN2X(0, ms); memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1); - /* fall through to normal conf mode */ + fallthrough; case DAHDI_CONF_CONF: /* Normal conference mode */ if (is_pseudo_chan(ms)) /* if pseudo-channel */ { @@ -7985,7 +7985,7 @@ memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1); break; } - /* fall through */ + fallthrough; case DAHDI_CONF_CONFMON: /* Conference monitor mode */ if (ms->confmode & DAHDI_CONF_LISTENER) { /* Subtract out last sample written to conf */ @@ -8524,7 +8524,7 @@ break; } #endif - /* fall through intentionally */ + fallthrough; case DAHDI_SIG_FXSGS: /* FXS Groundstart */ if (rxsig == DAHDI_RXSIG_ONHOOK) { chan->ringdebtimer = RING_DEBOUNCE_TIME; @@ -8543,7 +8543,7 @@ chan->gotgs = 1; } } - /* fall through intentionally */ + fallthrough; case DAHDI_SIG_FXOLS: /* FXO Loopstart */ case DAHDI_SIG_FXOKS: /* FXO Kewlstart */ switch(rxsig) { @@ -8643,7 +8643,7 @@ __dahdi_hooksig_pvt(chan, DAHDI_RXSIG_START); break; } - /* Fall through */ + fallthrough; case DAHDI_SIG_EM_E1: case DAHDI_SIG_FXOLS: /* FXO Loopstart */ case DAHDI_SIG_FXOKS: /* FXO Kewlstart */ @@ -8661,7 +8661,7 @@ break; case DAHDI_SIG_FXSKS: /* FXS Kewlstart */ case DAHDI_SIG_FXSGS: /* FXS Groundstart */ - /* Fall through */ + fallthrough; case DAHDI_SIG_FXSLS: if (!(cursig & DAHDI_BBIT)) { /* Check for ringing first */ @@ -9090,7 +9090,7 @@ memcpy(ss->putlin, putlin, DAHDI_CHUNKSIZE * sizeof(short)); break; } - /* fall through */ + fallthrough; case DAHDI_CONF_CONFANN: /* Conference with announce */ if (ms->confmode & DAHDI_CONF_TALKER) { /* Store temp value */ diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c index 8467767..d3d0777 100644 --- a/drivers/dahdi/wcaxx-base.c +++ b/drivers/dahdi/wcaxx-base.c @@ -1445,6 +1445,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK); + fallthrough; case BATTERY_PRESENT: fxo->battery_state = BATTERY_DEBOUNCING_LOST; fxo->battdebounce_timer = wc->framecount + battdebounce; @@ -1553,6 +1554,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK); + fallthrough; case BATTERY_LOST: /* intentional drop through */ fxo->battery_state = BATTERY_DEBOUNCING_PRESENT; fxo->battdebounce_timer = wc->framecount + battdebounce; diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 6571f17..9baaea5 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1954,6 +1954,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK); + fallthrough; case BATTERY_PRESENT: fxo->battery_state = BATTERY_DEBOUNCING_LOST; fxo->battdebounce_timer = wc->framecount + battdebounce; @@ -2062,6 +2063,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK); + fallthrough; case BATTERY_LOST: /* intentional drop through */ fxo->battery_state = BATTERY_DEBOUNCING_PRESENT; fxo->battdebounce_timer = wc->framecount + battdebounce; diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index da1393e..434d3e8 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -148,7 +148,7 @@ XPD_NOTICE(xpd, "'I' is deprecated in register commands. " "Use 'S' instead.\n"); - /* fall through */ + fallthrough; case 'S': do_subreg = 1; num_args += 2; /* register + subreg */ diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 7480904..778c2b2 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -58,6 +58,13 @@ #include <linux/poll.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) +#include <linux/compiler_attributes.h> +#endif +#ifndef fallthrough +#define fallthrough do {} while (0) /* fallthrough */ +#endif + #ifdef CONFIG_PCI #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) #include <linux/pci.h> -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 Gerrit-Change-Number: 27910 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in dahdi-linux[master]: Fix -Wimplicit-fallthrough=5 warnings
by laforge 25 Apr '22

25 Apr '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27910 ) Change subject: Fix -Wimplicit-fallthrough=5 warnings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 Gerrit-Change-Number: 27910 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 24 Apr 2022 17:30:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: Fix -Wimplicit-fallthrough=5 warnings
by laforge 25 Apr '22

25 Apr '22

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/27910 to look at the new patch set (#2). Change subject: Fix -Wimplicit-fallthrough=5 warnings ...................................................................... Fix -Wimplicit-fallthrough=5 warnings Modern Linux (since 5.4) builds with -Wimplicit-fallthrough=5. On some environments (notably Debian buster) this is even an error, so building dahdi-linux will fail. Let's add the proper 'fallthrough' annotation of linux/compiler_attributes.h and add a backwards-compatibility definition for older kernels. Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/wcaxx-base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/card_global.c M include/dahdi/kernel.h 5 files changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/10/27910/2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 Gerrit-Change-Number: 27910 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in dahdi-linux[master]: wcte13xp: Fix missing break statement when setting J1 line mode
by laforge 25 Apr '22

25 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27909 ) Change subject: wcte13xp: Fix missing break statement when setting J1 line mode ...................................................................... wcte13xp: Fix missing break statement when setting J1 line mode Change-Id: I776812d9fc4d8cb1140555e70a3480bdaf0aaaaf --- M drivers/dahdi/wcte13xp-base.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c index 69f7099..cfbdd4a 100644 --- a/drivers/dahdi/wcte13xp-base.c +++ b/drivers/dahdi/wcte13xp-base.c @@ -1874,6 +1874,7 @@ "Changing from %s to E1 line mode.\n", dahdi_spantype2str(wc->span.spantype)); res = t13x_software_init(wc, J1); + break; default: dev_err(&wc->xb.pdev->dev, "Got invalid linemode '%s' from dahdi\n", -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I776812d9fc4d8cb1140555e70a3480bdaf0aaaaf Gerrit-Change-Number: 27909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in dahdi-linux[master]: wcte13xp: Fix missing break statement when setting J1 line mode
by laforge 25 Apr '22

25 Apr '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27909 ) Change subject: wcte13xp: Fix missing break statement when setting J1 line mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I776812d9fc4d8cb1140555e70a3480bdaf0aaaaf Gerrit-Change-Number: 27909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 24 Apr 2022 17:25:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in dahdi-linux[master]: Fix -Wimplicit-fallthrough=5 warnings
by laforge 25 Apr '22

25 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27910 ) Change subject: Fix -Wimplicit-fallthrough=5 warnings ...................................................................... Fix -Wimplicit-fallthrough=5 warnings Modern Linux (since 5.4) builds with -Wimplicit-fallthrough=5. On some environments (notably Debian buster) this is even an error, so building dahdi-linux will fail. Let's add the proper 'fallthrough' annotation of linux/compiler_attributes.h and add a backwards-compatibility definition for older kernels. Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/wcaxx-base.c M drivers/dahdi/wctdm24xxp/base.c M drivers/dahdi/xpp/card_global.c M include/dahdi/kernel.h 5 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/10/27910/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 2b6256b..7bcbda6 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -7961,7 +7961,7 @@ memset(getlin, 0, DAHDI_CHUNKSIZE * sizeof(short)); txb[0] = DAHDI_LIN2X(0, ms); memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1); - /* fall through to normal conf mode */ + fallthrough; case DAHDI_CONF_CONF: /* Normal conference mode */ if (is_pseudo_chan(ms)) /* if pseudo-channel */ { @@ -7985,7 +7985,7 @@ memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1); break; } - /* fall through */ + fallthrough; case DAHDI_CONF_CONFMON: /* Conference monitor mode */ if (ms->confmode & DAHDI_CONF_LISTENER) { /* Subtract out last sample written to conf */ @@ -8524,7 +8524,7 @@ break; } #endif - /* fall through intentionally */ + fallthrough; case DAHDI_SIG_FXSGS: /* FXS Groundstart */ if (rxsig == DAHDI_RXSIG_ONHOOK) { chan->ringdebtimer = RING_DEBOUNCE_TIME; @@ -8543,7 +8543,7 @@ chan->gotgs = 1; } } - /* fall through intentionally */ + fallthrough; case DAHDI_SIG_FXOLS: /* FXO Loopstart */ case DAHDI_SIG_FXOKS: /* FXO Kewlstart */ switch(rxsig) { @@ -8643,7 +8643,7 @@ __dahdi_hooksig_pvt(chan, DAHDI_RXSIG_START); break; } - /* Fall through */ + fallthrough; case DAHDI_SIG_EM_E1: case DAHDI_SIG_FXOLS: /* FXO Loopstart */ case DAHDI_SIG_FXOKS: /* FXO Kewlstart */ @@ -8661,7 +8661,7 @@ break; case DAHDI_SIG_FXSKS: /* FXS Kewlstart */ case DAHDI_SIG_FXSGS: /* FXS Groundstart */ - /* Fall through */ + fallthrough; case DAHDI_SIG_FXSLS: if (!(cursig & DAHDI_BBIT)) { /* Check for ringing first */ @@ -9090,7 +9090,7 @@ memcpy(ss->putlin, putlin, DAHDI_CHUNKSIZE * sizeof(short)); break; } - /* fall through */ + fallthrough; case DAHDI_CONF_CONFANN: /* Conference with announce */ if (ms->confmode & DAHDI_CONF_TALKER) { /* Store temp value */ diff --git a/drivers/dahdi/wcaxx-base.c b/drivers/dahdi/wcaxx-base.c index 8467767..d3d0777 100644 --- a/drivers/dahdi/wcaxx-base.c +++ b/drivers/dahdi/wcaxx-base.c @@ -1445,6 +1445,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK); + fallthrough; case BATTERY_PRESENT: fxo->battery_state = BATTERY_DEBOUNCING_LOST; fxo->battdebounce_timer = wc->framecount + battdebounce; @@ -1553,6 +1554,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK); + fallthrough; case BATTERY_LOST: /* intentional drop through */ fxo->battery_state = BATTERY_DEBOUNCING_PRESENT; fxo->battdebounce_timer = wc->framecount + battdebounce; diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 6571f17..9baaea5 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1954,6 +1954,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK); + fallthrough; case BATTERY_PRESENT: fxo->battery_state = BATTERY_DEBOUNCING_LOST; fxo->battdebounce_timer = wc->framecount + battdebounce; @@ -2062,6 +2063,7 @@ break; case BATTERY_UNKNOWN: mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK); + fallthrough; case BATTERY_LOST: /* intentional drop through */ fxo->battery_state = BATTERY_DEBOUNCING_PRESENT; fxo->battdebounce_timer = wc->framecount + battdebounce; diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index da1393e..434d3e8 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -148,7 +148,7 @@ XPD_NOTICE(xpd, "'I' is deprecated in register commands. " "Use 'S' instead.\n"); - /* fall through */ + fallthrough; case 'S': do_subreg = 1; num_args += 2; /* register + subreg */ diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 7480904..9a213b7 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -58,6 +58,11 @@ #include <linux/poll.h> +#include <linux/compiler_attributes.h> +#ifndef fallthrough +#define fallthrough do {} while (0) /* fallthrough */ +#endif + #ifdef CONFIG_PCI #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) #include <linux/pci.h> -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3507876d90dd882b95c22ece51e8620ad6f0bd08 Gerrit-Change-Number: 27910 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log