Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932696AbZJAO3Y (ORCPT ); Thu, 1 Oct 2009 10:29:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932661AbZJAO3X (ORCPT ); Thu, 1 Oct 2009 10:29:23 -0400 Received: from gimli.pxnet.com ([195.227.45.7]:34290 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932542AbZJAO3X (ORCPT ); Thu, 1 Oct 2009 10:29:23 -0400 From: Tilman Schmidt Subject: [PATCH] net/ppp: fix comments - ppp_{sync,asynctty}_receive() may sleep To: Alan Cox , Alan Cox , Paul Mackerras , linux-ppp@vger.kernel.org CC: David Miller , netdev@vger.kernel.org, Jarek Poplawski , linux-kernel@vger.kernel.org Message-Id: <20091001142844.C50E511186D@xenon.ts.pxnet.com> Date: Thu, 1 Oct 2009 16:28:44 +0200 (CEST) X-Spam-Score: -2.212 () BAYES_00,RDNS_NONE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1815 Lines: 51 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 --- drivers/net/ppp_async.c | 5 +---- 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 6de8399..30b1b33 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 d2fa2db..c908b08 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) -- 1.6.2.1.214.ge986c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/