File 0001-icE1usb-Fix-span-re-configuration-after-fi... of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-icE1usb-Fix-span-re-configuration-after-first-start.patch of Package dahdi-linux (Revision b3d09f54efbbf32449fcd6147374f979)

Currently displaying revision b3d09f54efbbf32449fcd6147374f979 , Show latest

From ffff56716304daa783454054daddb4905e0ae3d5 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Fri, 31 Dec 2021 19:24:44 +0100
Subject: [PATCH 1/6] icE1usb: Fix span re-configuration after first start

Before this commit, we used to "lock up" the E1 span on every subsequent
span re-configuration from userspace.  This typically happens when the
user calls the `dahdi_cfg` userspace utility.  As normally this only
happens once at system start-up, this bug was only discovered now.

Closes: OS#5379
---
 drivers/dahdi/icE1usb/icE1usb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c
index 8cb1d12..f854527 100644
--- a/drivers/dahdi/icE1usb/icE1usb.c
+++ b/drivers/dahdi/icE1usb/icE1usb.c
@@ -530,6 +530,7 @@ static int ice1usb_submit_irq_urb(struct ice1usb *ieu, gfp_t mem_flags)
  ***********************************************************************/
 
 static int e1u_d_startup(struct file *file, struct dahdi_span *span);
+static int e1u_d_shutdown(struct dahdi_span *span);
 
 static int e1u_d_spanconfig(struct file *file, struct dahdi_span *span,
 			    struct dahdi_lineconfig *lc)
@@ -555,8 +556,13 @@ static int e1u_d_spanconfig(struct file *file, struct dahdi_span *span,
 	}
 
 	/* If we're already running, then go ahead and apply the changes */
-	if (span->flags & DAHDI_FLAG_RUNNING)
+	if (span->flags & DAHDI_FLAG_RUNNING) {
+		/* there should probably be a more elegant way to do this, but
+		 * we don't expect people to keep re-configuring their span all
+		 * day long, so a brief interruption is deemed acceptable */
+		e1u_d_shutdown(span);
 		e1u_d_startup(file, span);
+	}
 
 	return 0;
 }
-- 
2.34.1

Places

File 0001-icE1usb-Fix-span-re-configuration-after-first-start.patch of Package dahdi-linux (Revision b3d09f54efbbf32449fcd6147374f979)

Places