This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / ppp_generic.c

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c50980e..a567410 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -19,7 +19,7 @@
  * PPP driver, written by Michael Callahan and Al Longyear, and
  * subsequently hacked by Paul Mackerras.
  *
- * ==FILEVERSION 20041108==
+ * ==FILEVERSION 20020217==
  */
 
 #include <linux/config.h>
@@ -412,17 +412,6 @@ static ssize_t ppp_read(struct file *file, char __user *buf,
                ret = 0;
                if (pf->dead)
                        break;
-               if (pf->kind == INTERFACE) {
-                       /*
-                        * Return 0 (EOF) on an interface that has no
-                        * channels connected, unless it is looping
-                        * network traffic (demand mode).
-                        */
-                       struct ppp *ppp = PF_TO_PPP(pf);
-                       if (ppp->n_channels == 0
-                           && (ppp->flags & SC_LOOP_TRAFFIC) == 0)
-                               break;
-               }
                ret = -EAGAIN;
                if (file->f_flags & O_NONBLOCK)
                        break;
@@ -502,14 +491,6 @@ static unsigned int ppp_poll(struct file *file, poll_table *wait)
                mask |= POLLIN | POLLRDNORM;
        if (pf->dead)
                mask |= POLLHUP;
-       else if (pf->kind == INTERFACE) {
-               /* see comment in ppp_read */
-               struct ppp *ppp = PF_TO_PPP(pf);
-               if (ppp->n_channels == 0
-                   && (ppp->flags & SC_LOOP_TRAFFIC) == 0)
-                       mask |= POLLIN | POLLRDNORM;
-       }
-
        return mask;
 }
 
@@ -1939,7 +1920,7 @@ ppp_register_channel(struct ppp_channel *chan)
 #endif /* CONFIG_PPP_MULTILINK */
        init_rwsem(&pch->chan_sem);
        spin_lock_init(&pch->downl);
-       rwlock_init(&pch->upl);
+       pch->upl = RW_LOCK_UNLOCKED;
        spin_lock_bh(&all_channels_lock);
        pch->file.index = ++last_channel_index;
        list_add(&pch->list, &new_channels);
@@ -2578,8 +2559,7 @@ ppp_disconnect_channel(struct channel *pch)
                /* remove it from the ppp unit's list */
                ppp_lock(ppp);
                list_del(&pch->clist);
-               if (--ppp->n_channels == 0)
-                       wake_up_interruptible(&ppp->file.rwait);
+               --ppp->n_channels;
                ppp_unlock(ppp);
                if (atomic_dec_and_test(&ppp->file.refcnt))
                        ppp_destroy_interface(ppp);