Commit aa1190a2 authored by David Woodhouse's avatar David Woodhouse

[PATCH] Remove cli() from R3964 line discipline.

I did this ages ago but never submitted it because I never got round to
testing it. I still haven't tested it, but it ought to work, and the code
is definitely broken without it...
parent 86560be4
This diff is collapsed.
...@@ -13,6 +13,12 @@ ...@@ -13,6 +13,12 @@
* L. Haag * L. Haag
* *
* $Log: r3964.h,v $ * $Log: r3964.h,v $
* Revision 1.3 2001/03/18 13:02:24 dwmw2
* Fix timer usage, use spinlocks properly.
*
* Revision 1.2 2001/03/18 12:53:15 dwmw2
* Merge changes in 2.4.2
*
* Revision 1.1.1.1 1998/10/13 16:43:14 dwmw2 * Revision 1.1.1.1 1998/10/13 16:43:14 dwmw2
* This'll screw the version control * This'll screw the version control
* *
...@@ -103,6 +109,7 @@ enum { R3964_IDLE, ...@@ -103,6 +109,7 @@ enum { R3964_IDLE,
struct r3964_message; struct r3964_message;
struct r3964_client_info { struct r3964_client_info {
spinlock_t lock;
pid_t pid; pid_t pid;
unsigned int sig_flags; unsigned int sig_flags;
...@@ -186,6 +193,7 @@ struct r3964_block_header ...@@ -186,6 +193,7 @@ struct r3964_block_header
struct r3964_info { struct r3964_info {
spinlock_t lock;
struct tty_struct *tty; struct tty_struct *tty;
unsigned char priority; unsigned char priority;
unsigned char *rx_buf; /* ring buffer */ unsigned char *rx_buf; /* ring buffer */
...@@ -209,11 +217,8 @@ struct r3964_info { ...@@ -209,11 +217,8 @@ struct r3964_info {
unsigned int state; unsigned int state;
unsigned int flags; unsigned int flags;
int count_down; struct timer_list tmr;
int nRetry; int nRetry;
struct tq_struct bh_1;
struct tq_struct bh_2;
}; };
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment