diff options
author | Tilman Schmidt <tilman@imap.cc> | 2009-10-01 00:28:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-07 04:07:41 -0400 |
commit | 92d326f61b553250780786e9dd8609d4b32f8de7 (patch) | |
tree | 3a25922deeefb001c9303e2f33465f5a2d1fb01b | |
parent | a549952ad323d68daf5b50bf716db895479af84c (diff) |
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>
-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) | |||
337 | return 0; | 337 | return 0; |
338 | } | 338 | } |
339 | 339 | ||
340 | /* | 340 | /* May sleep, don't call from interrupt level or with interrupts disabled */ |
341 | * This can now be called from hard interrupt level as well | ||
342 | * as soft interrupt level or mainline. | ||
343 | */ | ||
344 | static void | 341 | static void |
345 | ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, | 342 | ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf, |
346 | char *cflags, int count) | 343 | 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) | |||
378 | return 0; | 378 | return 0; |
379 | } | 379 | } |
380 | 380 | ||
381 | /* | 381 | /* May sleep, don't call from interrupt level or with interrupts disabled */ |
382 | * This can now be called from hard interrupt level as well | ||
383 | * as soft interrupt level or mainline. | ||
384 | */ | ||
385 | static void | 382 | static void |
386 | ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf, | 383 | ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf, |
387 | char *cflags, int count) | 384 | char *cflags, int count) |