aboutsummaryrefslogtreecommitdiff
path: root/misc/dahdi-kmod
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2012-01-30 16:37:37 +0000
committerMax Khon <fjoe@FreeBSD.org>2012-01-30 16:37:37 +0000
commit9b5e7b03833f6d7a1d41d3f4f37d57f96fc8421e (patch)
tree1f9576b7dec0c561188931d974dc9878f6496d31 /misc/dahdi-kmod
parenta0a3d0fc26dc7113609f9a54b134cbb20f8aacd0 (diff)
downloadports-9b5e7b03833f6d7a1d41d3f4f37d57f96fc8421e.tar.gz
ports-9b5e7b03833f6d7a1d41d3f4f37d57f96fc8421e.zip
- Fix latency reconfiguration on 5th gen wct4xxp cards:
FILTER_SCHEDULE_THREAD does not work on FreeBSD as described -- it is not actually a bit flag, so should not be used with FILTER_HANDLED - Bump port version to 2.4.0rc5_3
Notes
Notes: svn path=/head/; revision=290121
Diffstat (limited to 'misc/dahdi-kmod')
-rw-r--r--misc/dahdi-kmod/Makefile2
-rw-r--r--misc/dahdi-kmod/files/patch-ithread26
2 files changed, 27 insertions, 1 deletions
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index f339d6836b18..fe346a8df6aa 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dahdi-kmod
PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc kld
MASTER_SITES= ${MASTER_SITE_LOCAL}\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
diff --git a/misc/dahdi-kmod/files/patch-ithread b/misc/dahdi-kmod/files/patch-ithread
new file mode 100644
index 000000000000..590adc1d19c9
--- /dev/null
+++ b/misc/dahdi-kmod/files/patch-ithread
@@ -0,0 +1,26 @@
+Index: freebsd/drivers/dahdi/wct4xxp/base.c
+===================================================================
+--- freebsd/drivers/dahdi/wct4xxp/base.c (revision 10453)
++++ freebsd/drivers/dahdi/wct4xxp/base.c (working copy)
+@@ -4132,7 +4132,7 @@
+ #endif
+ if (unlikely(test_bit(T4_CHANGE_LATENCY, &wc->checkflag) || test_bit(T4_CHECK_VPM, &wc->checkflag))) {
+ #if defined(__FreeBSD__)
+- res |= FILTER_SCHEDULE_THREAD;
++ res = FILTER_SCHEDULE_THREAD;
+ #else
+ tasklet_schedule(&wc->t4_tlet);
+ #endif
+Index: freebsd/drivers/dahdi/wctc4xxp/base.c
+===================================================================
+--- freebsd/drivers/dahdi/wctc4xxp/base.c (revision 10453)
++++ freebsd/drivers/dahdi/wctc4xxp/base.c (working copy)
+@@ -2931,7 +2931,7 @@
+ #if DEFERRED_PROCESSING == WORKQUEUE
+ schedule_work(&wc->deferred_work);
+ #elif DEFERRED_PROCESSING == ITHREAD
+- res |= FILTER_SCHEDULE_THREAD;
++ res = FILTER_SCHEDULE_THREAD;
+ #elif DEFERRED_PROCESSING == INTERRUPT
+ #error "You will need to change the locks if you want to run the processing " \
+ "in the interrupt handler."