Revert "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines."

[linux-2.6.git] / drivers / net / hamradio / 6pack.c

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 913a564..1551600 100644 (file)
--- 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;