October 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-msc[master]: Release BSS connection when SS message is rejected
by laforge 03 Oct '24

03 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38305?usp=email ) Change subject: Release BSS connection when SS message is rejected ...................................................................... Release BSS connection when SS message is rejected When an initial call-independent supplementary service message is received, it is checked whether the message is a REGISTER message. If it is not, the MSC will reject it by sending a RELEASE COMPLETE message. This patch ensures that the MSC_A use counter is decremented, so that the BSS connection is released, if it is not used by any other transaction. Without this patch, the msc_a_fsm would wait 5 seconds for an initial transaction before releasing the BSS connection. Related: OS#6427 Change-Id: Ic6765e5d480735e67d97f0f560da24653b26d487 --- M src/libmsc/gsm_09_11.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index e293890..ab40f02 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -142,6 +142,9 @@ gsm48_tx_simple(msc_a, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); + /* Decrement use counter that has been incremented by CM Service Request (SS). + * If there is no other service request, the BSS connection will be released. */ + msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS); return -EINVAL; } @@ -151,6 +154,9 @@ gsm48_tx_simple(msc_a, GSM48_PDISC_NC_SS | (tid << 4), GSM0480_MTYPE_RELEASE_COMPLETE); + /* Decrement use counter that has been incremented by CM Service Request (SS). + * If there is no other service request, the BSS connection will be released. */ + msc_a_put(msc_a, MSC_A_USE_CM_SERVICE_SS); return -ENOMEM; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic6765e5d480735e67d97f0f560da24653b26d487 Gerrit-Change-Number: 38305 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-msc[master]: Release BSS connection when SS message is rejected
by laforge 03 Oct '24

03 Oct '24

Attention is currently required from: jolly, neels, pespin. laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-msc/+/38305?usp=email ) Change subject: Release BSS connection when SS message is rejected ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic6765e5d480735e67d97f0f560da24653b26d487 Gerrit-Change-Number: 38305 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Oct 2024 15:24:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...pyosmocom[master]: tlv/cosmetic: improve import of osmocom functions
by laforge 03 Oct '24

03 Oct '24

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email ) Change subject: tlv/cosmetic: improve import of osmocom functions ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/python/pyosmocom/+/38288/comment/8a420648_4739… : PS1, Line 9: We can import osmocom and then reference > This must also be merged *before* tagging 0.0.5 sadly we now have a tagged 0.0.5 *without* this patch despite my explicit comment here. @pmaier @osmith -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a Gerrit-Change-Number: 38288 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Oct 2024 15:23:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in dahdi-linux[master]: xpp: Add braces around empty if statements.
by laforge 03 Oct '24

03 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38322?usp=email ) Change subject: xpp: Add braces around empty if statements. ...................................................................... xpp: Add braces around empty if statements. Avoid compilation failure on modern kernels by adding braces around empty if body. Resolves: #65 Change-Id: Icc5cc97105aa9894bfe891acc2a84737a4f3241f --- M drivers/dahdi/xpp/card_fxs.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index 8b96f83..7080fbc 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -1169,10 +1169,12 @@ "%s: VMWI(hvdc) is not implemented yet. Ignored.\n", __func__); } - if (VMWI_TYPE(priv, pos, HVAC)) + if (VMWI_TYPE(priv, pos, HVAC)) { ; /* VMWI_NEON */ - if (priv->vmwisetting[pos].vmwi_type == 0) + } + if (priv->vmwisetting[pos].vmwi_type == 0) { ; /* Disable VMWI */ + } priv->vmwisetting[pos] = vmwisetting; set_vm_led_mode(xpd->xbus, xpd, pos, PHONEDEV(xpd).msg_waiting[pos]); return 0; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Icc5cc97105aa9894bfe891acc2a84737a4f3241f Gerrit-Change-Number: 38322 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in dahdi-linux[master]: xpp, sysfs: Use const struct device_device if needed.
by laforge 03 Oct '24

03 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email ) Change subject: xpp, sysfs: Use const struct device_device if needed. ...................................................................... xpp, sysfs: Use const struct device_device if needed. Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8 changed struct device_driver to be const, so make the arguments const on kernels 6.11 and newer. Resolves: #63 Change-Id: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 --- M drivers/dahdi/dahdi-sysfs-chan.c M drivers/dahdi/dahdi-sysfs.c M drivers/dahdi/xpp/xbus-sysfs.c 3 files changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c index fcfb7ba..1efb0d7 100644 --- a/drivers/dahdi/dahdi-sysfs-chan.c +++ b/drivers/dahdi/dahdi-sysfs-chan.c @@ -220,7 +220,11 @@ chan_dbg(DEVICES, chan, "SYSFS\n"); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int chan_match(struct device *dev, const struct device_driver *driver) +#else static int chan_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { struct dahdi_chan *chan; diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index 14a6d74..f6fe1fc 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -42,7 +42,11 @@ MODULE_PARM_DESC(tools_rootdir, "root directory of all tools paths (default /)"); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int span_match(struct device *dev, const struct device_driver *driver) +#else static int span_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { return 1; } diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 34cab65..72cd4fd 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -397,7 +397,11 @@ ATTRIBUTE_GROUPS(xbus_dev); #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int astribank_match(struct device *dev, const struct device_driver *driver) +#else static int astribank_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n", dev_name(dev), driver->name); @@ -761,7 +765,11 @@ return len; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int xpd_match(struct device *dev, const struct device_driver *driver) +#else static int xpd_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { struct xpd_driver *xpd_driver; xpd_t *xpd; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 Gerrit-Change-Number: 38321 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in dahdi-linux[master]: xpp, sysfs: Use const struct device_device if needed.
by laforge 03 Oct '24

03 Oct '24

Attention is currently required from: roox. laforge has posted comments on this change by roox. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email ) Change subject: xpp, sysfs: Use const struct device_device if needed. ...................................................................... Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 Gerrit-Change-Number: 38321 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Thu, 03 Oct 2024 15:21:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in dahdi-linux[master]: xpp: Add braces around empty if statements.
by laforge 03 Oct '24

03 Oct '24

Attention is currently required from: roox. laforge has posted comments on this change by roox. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38322?usp=email ) Change subject: xpp: Add braces around empty if statements. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Icc5cc97105aa9894bfe891acc2a84737a4f3241f Gerrit-Change-Number: 38322 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Thu, 03 Oct 2024 15:21:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in dahdi-linux[master]: xpp, sysfs: Use const struct device_device if needed.
by laforge 03 Oct '24

03 Oct '24

Attention is currently required from: roox. laforge has posted comments on this change by roox. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email ) Change subject: xpp, sysfs: Use const struct device_device if needed. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 Gerrit-Change-Number: 38321 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Thu, 03 Oct 2024 15:20:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in dahdi-linux[master]: xpp: Add braces around empty if statements.
by roox 03 Oct '24

03 Oct '24

roox has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38322?usp=email ) Change subject: xpp: Add braces around empty if statements. ...................................................................... xpp: Add braces around empty if statements. Avoid compilation failure on modern kernels by adding braces around empty if body. Resolves: #65 Change-Id: Icc5cc97105aa9894bfe891acc2a84737a4f3241f --- M drivers/dahdi/xpp/card_fxs.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/22/38322/1 diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index 8b96f83..7080fbc 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -1169,10 +1169,12 @@ "%s: VMWI(hvdc) is not implemented yet. Ignored.\n", __func__); } - if (VMWI_TYPE(priv, pos, HVAC)) + if (VMWI_TYPE(priv, pos, HVAC)) { ; /* VMWI_NEON */ - if (priv->vmwisetting[pos].vmwi_type == 0) + } + if (priv->vmwisetting[pos].vmwi_type == 0) { ; /* Disable VMWI */ + } priv->vmwisetting[pos] = vmwisetting; set_vm_led_mode(xpd->xbus, xpd, pos, PHONEDEV(xpd).msg_waiting[pos]); return 0; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38322?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: Icc5cc97105aa9894bfe891acc2a84737a4f3241f Gerrit-Change-Number: 38322 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de>

1 0

[S] Change in dahdi-linux[master]: xpp, sysfs: Use const struct device_device if needed.
by roox 03 Oct '24

03 Oct '24

roox has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/38321?usp=email ) Change subject: xpp, sysfs: Use const struct device_device if needed. ...................................................................... xpp, sysfs: Use const struct device_device if needed. Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8 changed struct device_driver to be const, so make the arguments const on kernels 6.11 and newer. Resolves: #63 Change-Id: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 --- M drivers/dahdi/dahdi-sysfs-chan.c M drivers/dahdi/dahdi-sysfs.c M drivers/dahdi/xpp/xbus-sysfs.c 3 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/21/38321/1 diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c index fcfb7ba..1efb0d7 100644 --- a/drivers/dahdi/dahdi-sysfs-chan.c +++ b/drivers/dahdi/dahdi-sysfs-chan.c @@ -220,7 +220,11 @@ chan_dbg(DEVICES, chan, "SYSFS\n"); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int chan_match(struct device *dev, const struct device_driver *driver) +#else static int chan_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { struct dahdi_chan *chan; diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index 14a6d74..f6fe1fc 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -42,7 +42,11 @@ MODULE_PARM_DESC(tools_rootdir, "root directory of all tools paths (default /)"); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int span_match(struct device *dev, const struct device_driver *driver) +#else static int span_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { return 1; } diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 34cab65..72cd4fd 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -397,7 +397,11 @@ ATTRIBUTE_GROUPS(xbus_dev); #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int astribank_match(struct device *dev, const struct device_driver *driver) +#else static int astribank_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n", dev_name(dev), driver->name); @@ -761,7 +765,11 @@ return len; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) +static int xpd_match(struct device *dev, const struct device_driver *driver) +#else static int xpd_match(struct device *dev, struct device_driver *driver) +#endif /* LINUX_VERSION_CODE */ { struct xpd_driver *xpd_driver; xpd_t *xpd; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/38321?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: Ibc20d83adb9b5814b05ec38a33e307ab8c9f0d51 Gerrit-Change-Number: 38321 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de>

1 0