[parisc-linux] Re: [parisc-linux-cvs] DIFF 2.4.20-rc1-pa7

Matthew Wilcox willy@debian.org
Fri, 22 Nov 2002 20:01:32 +0000


On Fri, Nov 22, 2002 at 11:23:25AM -0700, Grant Grundler wrote:
> Index: drivers/net/ppp_generic.c
> ===================================================================
> RCS file: /var/cvs/linux/drivers/net/ppp_generic.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 ppp_generic.c
> --- drivers/net/ppp_generic.c	13 Nov 2002 16:57:46 -0000	1.14
> +++ drivers/net/ppp_generic.c	22 Nov 2002 05:53:55 -0000
> @@ -387,9 +387,9 @@ static ssize_t ppp_read(struct file *fil
>  	for (;;) {
>  		set_current_state(TASK_INTERRUPTIBLE);
>  		skb = skb_dequeue(&pf->rq);
> +		ret = 0;
>  		if (skb)
>  			break;
> -		ret = 0;
>  		if (pf->dead)
>  			break;
>  		ret = -EAGAIN;

Uhh.. why have you made this change?  It's clearly wrong and diverges
from upstream.

-- 
Revolutions do not require corporate support.