[Pkg-voip-commits] [dahdi-linux] 10/12: set spantype for wctdm and wcfxo (Closes: #823952)

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to annotated tag debian/1%2.11.1_dfsg-1
in repository dahdi-linux.

commit 0d6cbbccbdc9c3c37a1c08f76d71b7b5ffa75ccb
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Sep 21 21:25:07 2016 +0300

    set spantype for wctdm and wcfxo (Closes: #823952)
    
    The two old analog drivers (wcfxo and wctdm were missing the spantype of
    each span. Set it.
---
 debian/patches/series                         |  1 +
 debian/patches/wcfxo-wctdm-set-spantype.patch | 37 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 0d1c5d2..66fbae3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ notest
 tor2-request_firmware
 pciradio-request_firmware
 hotplug_mod_params
+wcfxo-wctdm-set-spantype.patch
diff --git a/debian/patches/wcfxo-wctdm-set-spantype.patch b/debian/patches/wcfxo-wctdm-set-spantype.patch
new file mode 100644
index 0000000..4507167
--- /dev/null
+++ b/debian/patches/wcfxo-wctdm-set-spantype.patch
@@ -0,0 +1,37 @@
+From e3a3d19d2a22ce397ed742bebb978795b902025f Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Wed, 21 Sep 2016 11:51:45 +0300
+Subject: [PATCH] wcfxo, wctdm: set spantype
+
+---
+ drivers/dahdi/wcfxo.c |    1 +
+ drivers/dahdi/wctdm.c |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
+index b79d2fe..bf1d467 100644
+--- a/drivers/dahdi/wcfxo.c
++++ b/drivers/dahdi/wcfxo.c
+@@ -685,6 +685,7 @@ static int wcfxo_initialize(struct wcfxo *wc)
+ 
+ 	wc->chan->pvt = wc;
+ 	wc->span.ops = &wcfxo_span_ops;
++	wc->span.spantype = SPANTYPE_ANALOG_FXO;
+ 	list_add_tail(&wc->span.device_node, &wc->ddev->spans);
+ 	if (dahdi_register_device(wc->ddev, &wc->dev->dev)) {
+ 		printk(KERN_NOTICE "Unable to register span with DAHDI\n");
+diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
+index 9f43e52..cf5a537 100644
+--- a/drivers/dahdi/wctdm.c
++++ b/drivers/dahdi/wctdm.c
+@@ -2411,6 +2411,7 @@ static int wctdm_initialize(struct wctdm *wc)
+ 	wc->span.channels = NUM_CARDS;
+ 	wc->span.flags = DAHDI_FLAG_RBS;
+ 	wc->span.ops = &wctdm_span_ops;
++	wc->span.spantype = SPANTYPE_ANALOG_MIXED;
+ 
+ 	list_add_tail(&wc->span.device_node, &wc->ddev->spans);
+ 	if (dahdi_register_device(wc->ddev, &wc->dev->dev)) {
+-- 
+1.7.9.5
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-linux.git