diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-14 22:13:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-14 22:13:41 +0200 |
| commit | 252aa9d94a04252046f3a382e6aca1b5c95921d8 (patch) | |
| tree | 5b265e4ae8011bd99938b2d4da5abac411aa6fc7 /drivers/net/hamradio/6pack.c | |
| parent | skbuff.h: Fix comment for NET_IP_ALIGN (diff) | |
| download | linux-252aa9d94a04252046f3a382e6aca1b5c95921d8.tar.xz linux-252aa9d94a04252046f3a382e6aca1b5c95921d8.zip | |
Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."
This reverts commit adeab1afb7de89555c69aab5ca21300c14af6369.
As Alan Cox explained, the TTY layer changes that went recently
to get rid of the tty->low_latency stuff fixes this already,
and even for -stable it's the ->low_latency changes that should
go in to fix this, rather than this patch.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio/6pack.c')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 913a56406594..155160052c8b 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -398,14 +398,13 @@ static DEFINE_RWLOCK(disc_data_lock); static struct sixpack *sp_get(struct tty_struct *tty) { - unsigned long flags; struct sixpack *sp; - read_lock_irqsave(&disc_data_lock, flags); + read_lock(&disc_data_lock); sp = tty->disc_data; if (sp) atomic_inc(&sp->refcnt); - read_unlock_irqrestore(&disc_data_lock, flags); + read_unlock(&disc_data_lock); return sp; } @@ -689,13 +688,12 @@ out: */ static void sixpack_close(struct tty_struct *tty) { - unsigned long flags; struct sixpack *sp; - write_lock_irqsave(&disc_data_lock, flags); + write_lock(&disc_data_lock); sp = tty->disc_data; tty->disc_data = NULL; - write_unlock_irqrestore(&disc_data_lock, flags); + write_unlock(&disc_data_lock); if (!sp) return; |