FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dynamic: Prevent oops due to inverted compile flag

Browse Source 
The logic on ENABLE_TASKELETS compiler flag was inverted causing an oops on
normal dahdi_cfg of a dynamic span.

Issue-id: https://issues.asterisk.org/jira/browse/DAHLIN-328

Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Michael Walton 2014-08-12 15:03:52 -05:00 committed by Russ Meyerriecks
parent 91bc5a3b57
commit eedb4bf944
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/dahdi/dahdi_dynamic.c
View File

@ -201,7 +201,9 @@ static void dahdi_dynamic_sendmessage(struct dahdi_dynamic *d)
static void __dahdi_dynamic_run(void) static void __dahdi_dynamic_run(void)
{ {
struct dahdi_dynamic *d; struct dahdi_dynamic *d;
#ifdef ENABLE_TASKLETS
struct dahdi_dynamic_driver *drv; struct dahdi_dynamic_driver *drv;
#endif
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(d, &dspan_list, list) { list_for_each_entry_rcu(d, &dspan_list, list) {
@ -211,6 +213,13 @@ static void __dahdi_dynamic_run(void)
} }
#ifdef ENABLE_TASKLETS #ifdef ENABLE_TASKLETS
list_for_each_entry_rcu(drv, &driver_list, list) {
/* Flush any traffic still pending in the driver */
if (drv->flush) {
drv->flush();
}
}
#else
/* If tasklets are not enabled, the above section will be called in /* If tasklets are not enabled, the above section will be called in
* interrupt context and the flushing of each driver will be called in a * interrupt context and the flushing of each driver will be called in a
* separate tasklet that only handles that. This is necessary since some * separate tasklet that only handles that. This is necessary since some
@ -221,13 +230,6 @@ static void __dahdi_dynamic_run(void)
* *
*/ */
tasklet_hi_schedule(&dahdi_dynamic_flush_tlet); tasklet_hi_schedule(&dahdi_dynamic_flush_tlet);
#else
list_for_each_entry_rcu(drv, &driver_list, list) {
/* Flush any traffic still pending in the driver */
if (drv->flush) {
drv->flush();
}
}
#endif #endif
rcu_read_unlock(); rcu_read_unlock();
} }