laforge has submitted this change. (
https://gerrit.osmocom.org/c/dahdi-linux/+/27838 )
Change subject: icE1usb: Fix inverted logic for clock timing source
......................................................................
icE1usb: Fix inverted logic for clock timing source
The 'struct dahdi_lineconfig.sync' parameter originates from the
'timing' field of system.conf. dahdi_cfg passes it via the SPANCONFIG
ioctl into the kernel.
The DAHDI docs say:
> source of the master clock. If you choose 0, the port will never
> be used as a source of timing. This is appropriate when you know the
> far end should always be a slave to you.
So if '0' we should use the local clock, and if > 0, the recovered
remote clock.
Thanks to Christoph Lauter for pointing this out.
Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad
---
M drivers/dahdi/icE1usb/icE1usb.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
manawyrm: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c
index e829b2d..7ab751e 100644
--- a/drivers/dahdi/icE1usb/icE1usb.c
+++ b/drivers/dahdi/icE1usb/icE1usb.c
@@ -691,9 +691,9 @@
ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0;
if (lc->sync > 0)
- ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_LOCAL;
- else
ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_REMOTE;
+ else
+ ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_LOCAL;
/* (re-)set to sane defaults */
ieu->cfg.tx.ext_loopback = ICE1USB_TX_EXT_LOOPBACK_OFF;
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad
Gerrit-Change-Number: 27838
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: manawyrm <[email protected]>
Gerrit-MessageType: merged
