aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/irda
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-06-04 07:35:16 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-12 18:50:23 -0400
commita3cc9fcff84c4c8aaecda2420acd89a1418d57e9 (patch)
tree417fefbc96cdea1649186b483bab077c839a2f21 /include/net/irda
parent718c4ca1f721be3ae67f9ff7d43b9a910e4a1ec3 (diff)
TTY: ircomm, add tty_port
And use close/open_wait from there. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Samuel Ortiz <samuel@sortiz.org> Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/irda')
-rw-r--r--include/net/irda/ircomm_tty.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index 59ba38bc400f..365fa6ec5298 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -62,6 +62,7 @@
62 */ 62 */
63struct ircomm_tty_cb { 63struct ircomm_tty_cb {
64 irda_queue_t queue; /* Must be first */ 64 irda_queue_t queue; /* Must be first */
65 struct tty_port port;
65 magic_t magic; 66 magic_t magic;
66 67
67 int state; /* Connect state */ 68 int state; /* Connect state */
@@ -97,8 +98,6 @@ struct ircomm_tty_cb {
97 void *skey; 98 void *skey;
98 void *ckey; 99 void *ckey;
99 100
100 wait_queue_head_t open_wait;
101 wait_queue_head_t close_wait;
102 struct timer_list watchdog_timer; 101 struct timer_list watchdog_timer;
103 struct work_struct tqueue; 102 struct work_struct tqueue;
104 103