diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-06-04 13:35:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-12 15:50:23 -0700 |
| commit | 849d5a997fe6a9e44401daed62a98121390ec0d3 (patch) | |
| tree | 1dad7891098bbd111e48a124f1097c9297c20cac /net/irda/ircomm/ircomm_tty_attach.c | |
| parent | 580d27b449cb8f540bba1cc54066bb44f4e6242d (diff) | |
| download | op-kernel-dev-849d5a997fe6a9e44401daed62a98121390ec0d3.zip op-kernel-dev-849d5a997fe6a9e44401daed62a98121390ec0d3.tar.gz | |
TTY: ircomm, use flags from tty_port
Switch to tty_port->flags. And while at it, remove redefined flags for
them.
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 'net/irda/ircomm/ircomm_tty_attach.c')
| -rw-r--r-- | net/irda/ircomm/ircomm_tty_attach.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c index bb1e935..bed311a 100644 --- a/net/irda/ircomm/ircomm_tty_attach.c +++ b/net/irda/ircomm/ircomm_tty_attach.c @@ -566,7 +566,8 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self) * will have to wait for the peer device (DCE) to raise the CTS * line. */ - if ((self->flags & ASYNC_CTS_FLOW) && ((self->settings.dce & IRCOMM_CTS) == 0)) { + if ((self->port.flags & ASYNC_CTS_FLOW) && + ((self->settings.dce & IRCOMM_CTS) == 0)) { IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __func__ ); return; } else { @@ -977,7 +978,7 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self, ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH); ircomm_tty_start_watchdog_timer(self, 3*HZ); - if (self->flags & ASYNC_CHECK_CD) { + if (self->port.flags & ASYNC_CHECK_CD) { /* Drop carrier */ self->settings.dce = IRCOMM_DELTA_CD; ircomm_tty_check_modem_status(self); |
