diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-06-02 20:01:34 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-06-02 20:01:34 +0000 |
| commit | cd419f86a583306c63a461b7e79a52e96c1e20bc (patch) | |
| tree | 41b574bfc2b9ce4a87bbdfed680ed69895342198 /drivers/dahdi/wctdm24xxp/xhfc.c | |
| parent | e1359adcca7980a13988af0366455bb2f4cb0980 (diff) | |
dahdi: Allow dahdi_span_ops.[chan|span]config and startup to block.
This change ensures that the dahdi_span_ops callbacks are not called
with any spinlocks held, and that the module is pinned in memory, and
also passes the struct file * pointer to the callbacks.
Passing the file pointer to the callbacks allows the board drivers to
check any flags on the file descriptor used to configure the
span/channel. The intent here is to allow dahdi_config to open the
/dev/dahdi/ctl file in a non-blocking mode in case there is a lengthy
processes that needs to happen as part of configuration.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9940 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm24xxp/xhfc.c')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/xhfc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/dahdi/wctdm24xxp/xhfc.c b/drivers/dahdi/wctdm24xxp/xhfc.c index fa63248..730d2e0 100644 --- a/drivers/dahdi/wctdm24xxp/xhfc.c +++ b/drivers/dahdi/wctdm24xxp/xhfc.c @@ -2175,7 +2175,8 @@ static int b400m_set_ntte(struct b400m_span *bspan, int te_mode, int term_on) } /* spanconfig for us means ...? */ -int b400m_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) +int b400m_spanconfig(struct file *file, struct dahdi_span *span, + struct dahdi_lineconfig *lc) { struct b400m_span *bspan; struct b400m *b4; @@ -2250,7 +2251,7 @@ int b400m_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc) * The solution to that is to simply increment the span's "restart" flag, and * the driver's workqueue will do the dirty work on our behalf. */ -int b400m_chanconfig(struct dahdi_chan *chan, int sigtype) +int b400m_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) { int alreadyrunning; struct b400m_span *bspan = bspan_from_dspan(chan->span); |