CAPI: Rework locking of controller data structures

[safe/jmp/linux-2.6] / include / linux / isdn / capilli.h

diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h
index 856f38e..11b57c4 100644 (file)
--- 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];