diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2009-10-01 04:28:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-07 01:07:41 -0700 |
| commit | 92d326f61b553250780786e9dd8609d4b32f8de7 (patch) | |
| tree | 3a25922deeefb001c9303e2f33465f5a2d1fb01b /drivers/net | |
| parent | a549952ad323d68daf5b50bf716db895479af84c (diff) | |
| download | linux-stable-92d326f61b553250780786e9dd8609d4b32f8de7.tar.gz linux-stable-92d326f61b553250780786e9dd8609d4b32f8de7.tar.bz2 linux-stable-92d326f61b553250780786e9dd8609d4b32f8de7.zip | |
net/ppp: fix comments - ppp_{sync,asynctty}_receive() may sleep
The receive_buf methods of the N_PPP and N_SYNC_PPP line disciplines,
ppp_asynctty_receive() and ppp_sync_receive(), call tty_unthrottle()
which may sleep. Fix the comments claiming otherwise.
Impact: documentation
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ppp_async.c | 5 | ||||
| -rw-r--r-- | drivers/net/ppp_synctty.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 6de8399d6dd9..30b1b3326765 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -337,10 +337,7 @@ ppp_asynctty_poll(struct tty_struct *tty, struct file *file, poll_table *wait) return 0; } -/* - * This can now be called from hard interrupt level as well - * as soft interrupt level or mainline. - */ +/* May sleep, don't call from interrupt level or with interrupts disabled */ static void ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, char *cflags, int count) diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c index d2fa2db13586..c908b08dc981 100644 --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c @@ -378,10 +378,7 @@ ppp_sync_poll(struct tty_struct *tty, struct file *file, poll_table *wait) return 0; } -/* - * This can now be called from hard interrupt level as well - * as soft interrupt level or mainline. - */ +/* May sleep, don't call from interrupt level or with interrupts disabled */ static void ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf, char *cflags, int count) |