[dahdi-commits] fjoe: freebsd/trunk r10454 - in /freebsd/trunk/drivers/dahdi: wcb4xxp/ wct4xx...

[SVN commits to the DAHDI project]

Author: fjoe
Date: Mon Jan 30 10:24:57 2012
New Revision: 10454

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10454
Log:
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.

This is probably the reason why ithread did not work in wcb4xxp
(the code is #if 0'ed for a long time, should be tested and fixed later).

Modified:
    freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
    freebsd/trunk/drivers/dahdi/wct4xxp/base.c
    freebsd/trunk/drivers/dahdi/wctc4xxp/base.c

Modified: freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=10454&r1=10453&r2=10454
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcb4xxp/base.c Mon Jan 30 10:24:57 2012
@@ -2598,7 +2598,7 @@
 /* kick off bottom-half handler */
 #if 0
 #if defined(__FreeBSD__)
-	return (FILTER_HANDLED | FILTER_SCHEDULE_THREAD);
+	return (FILTER_SCHEDULE_THREAD);
 #else
 	tasklet_hi_schedule(&b4->b4xxp_tlet);
 #endif

Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=10454&r1=10453&r2=10454
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Mon Jan 30 10:24:57 2012
@@ -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

Modified: freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=10454&r1=10453&r2=10454
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctc4xxp/base.c Mon Jan 30 10:24:57 2012
@@ -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."