Commit a6540f73 authored Jun 22, 2009 by Alan Cox Committed by Linus Torvalds Jun 22, 2009

ppp: Fix throttling bugs

The ppp layer goes around calling the unthrottle method from non sleeping
paths. This isn't safe because the unthrottle methods in the tty layer need
to be able to sleep (consider a USB dongle).

Until now this didn't show up because the ppp layer never actually throttled
a port so the unthrottle was always a no-op. Currently it's a mutex taking
path so warnings are spewed if the unthrottle occurs via certain paths.

Fix this by removing the unneccessary unthrottle calls.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a115902f

drivers/net/ppp_async.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -356,7 +356,6 @@ ppp_asynctty_receive(struct tty_struct tty, const unsigned char buf,
		if (!skb_queue_empty(&ap->rqueue))
		tasklet_schedule(&ap->tsk);
		ap_put(ap);
		tty_unthrottle(tty);
		}

		static void

drivers/net/ppp_synctty.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,6 @@ ppp_sync_receive(struct tty_struct tty, const unsigned char buf,
		if (!skb_queue_empty(&ap->rqueue))
		tasklet_schedule(&ap->tsk);
		sp_put(ap);
		tty_unthrottle(tty);
		}

		static void

Admin message