diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2010-02-08 13:12:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 03:01:22 +0300 |
| commit | 0ca3a017a7373a4545dd7b345a8a0cecc16bc7e2 (patch) | |
| tree | a739bfb8ddd0c7fcfdcd40ab6fcd990570c716bf /include/linux/isdn/capilli.h | |
| parent | ef69bb2ec6036945da1d3d3f07b75253f484f693 (diff) | |
| download | linux-0ca3a017a7373a4545dd7b345a8a0cecc16bc7e2.tar.xz | |
CAPI: Rework locking of controller data structures
This patch applies the mutex so far only protecting the controller list
to (almost) all accesses of controller data structures. It also reworks
waiting on state changes in old_capi_manufacturer so that it no longer
poll and holds a module reference to the controller owner while waiting
(the latter was partly done already). Modification and checking of the
blocked state remains racy by design, the caller is responsible for
dealing with this.
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/isdn/capilli.h')
| -rw-r--r-- | include/linux/isdn/capilli.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h index 856f38eddd78..11b57c485854 100644 --- a/include/linux/isdn/capilli.h +++ b/include/linux/isdn/capilli.h @@ -66,9 +66,10 @@ struct capi_ctr { unsigned long nsentdatapkt; int cnr; /* controller number */ - volatile unsigned short state; /* controller state */ - volatile int blocked; /* output blocked */ + unsigned short state; /* controller state */ + int blocked; /* output blocked */ int traceflag; /* capi trace */ + wait_queue_head_t state_wait_queue; struct proc_dir_entry *procent; char procfn[128]; |