diff options
author | Alan Cox <alan@redhat.com> | 2008-12-06 01:31:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-06 01:31:52 -0500 |
commit | 8a1ec21e6c856b996cffcd4b33f037f6748a3ab4 (patch) | |
tree | 048a099c0ee072c66f7ce21ed8f7f58c425b59b4 /drivers/net/wireless/strip.c | |
parent | 098401a600b6344771900fe164c5eafb668ce99c (diff) |
tty: Flags should be accessed via the foo_bit interfaces
We have various drivers that poke around directly and we need to clean this
up before it causes problems.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/strip.c')
-rw-r--r-- | drivers/net/wireless/strip.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index cf0d070ced13..f93caf4be328 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -1252,7 +1252,7 @@ static void strip_write_some_more(struct tty_struct *tty) | |||
1252 | #endif | 1252 | #endif |
1253 | } else { /* Else start transmission of another packet */ | 1253 | } else { /* Else start transmission of another packet */ |
1254 | 1254 | ||
1255 | tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); | 1255 | clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); |
1256 | strip_unlock(strip_info); | 1256 | strip_unlock(strip_info); |
1257 | } | 1257 | } |
1258 | } | 1258 | } |
@@ -1455,8 +1455,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb) | |||
1455 | */ | 1455 | */ |
1456 | strip_info->tx_head = strip_info->tx_buff; | 1456 | strip_info->tx_head = strip_info->tx_buff; |
1457 | strip_info->tx_left = ptr - strip_info->tx_buff; | 1457 | strip_info->tx_left = ptr - strip_info->tx_buff; |
1458 | strip_info->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP); | 1458 | set_bit(TTY_DO_WRITE_WAKEUP, &strip_info->tty->flags); |
1459 | |||
1460 | /* | 1459 | /* |
1461 | * 4. Debugging check to make sure we're not overflowing the buffer. | 1460 | * 4. Debugging check to make sure we're not overflowing the buffer. |
1462 | */ | 1461 | */ |
@@ -2454,8 +2453,7 @@ static int strip_close_low(struct net_device *dev) | |||
2454 | 2453 | ||
2455 | if (strip_info->tty == NULL) | 2454 | if (strip_info->tty == NULL) |
2456 | return -EBUSY; | 2455 | return -EBUSY; |
2457 | strip_info->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); | 2456 | clear_bit(TTY_DO_WRITE_WAKEUP, &strip_info->tty->flags); |
2458 | |||
2459 | netif_stop_queue(dev); | 2457 | netif_stop_queue(dev); |
2460 | 2458 | ||
2461 | /* | 2459 | /* |