* [PATCH] Missing PPPoE patch from 2.4.19-pre3
[not found] <15502.27007.923468.211270@argo.ozlabs.ibm.com>
@ 2002-03-12 21:49 ` Michal Ostrowski
0 siblings, 0 replies; only message in thread
From: Michal Ostrowski @ 2002-03-12 21:49 UTC (permalink / raw)
To: Paul MacKerras, marcelo, skraw, jojo.escubil; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3020 bytes --]
Part of Paul MacKerras's PPP patches got dropped somewhere.
Here's the missing part.
Michal Ostrowski
mostrows@speakeasy.net
> ---------- Forwarded message ----------
> Date: Mon, 11 Mar 2002 23:55:23 +0100
> From: Stephan von Krawczynski <skraw@ithnet.com>
> To: Marcelo Tosatti <marcelo@conectiva.com.br>
> Cc: lkml <linux-kernel@vger.kernel.org>
> Subject: Re: Linux 2.4.19-pre3
>
> >
> > Hi,
> >
> > Here goes -pre3, with the new IDE code. It has been stable enough
> time in
> > the -ac tree, in my and Alan's opinion.
> >
> > The inclusion of the new IDE code makes me want to have a longer
> 2.4.19
> > release cycle, for stress-testing reasons.
> >
> > Please stress test it with huge amounts of data ;)
>
> Would like to, but:
>
> gcc -D__KERNEL__ -I/usr/src/linux-2.4.19-pre3/include -Wall
> -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
> -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
> -march=i686 -DMODULE -DKBUILD_BASENAME=pppoe -c -o pppoe.o pppoe.c
> pppoe.c: In function `pppoe_flush_dev':
> pppoe.c:282: `PPPOX_ZOMBIE' undeclared (first use in this function)
> pppoe.c:282: (Each undeclared identifier is reported only once
> pppoe.c:282: for each function it appears in.)
> pppoe.c: In function `pppoe_disc_rcv':
> pppoe.c:446: `PPPOX_ZOMBIE' undeclared (first use in this function)
> pppoe.c: In function `pppoe_ioctl':
> pppoe.c:730: `PPPOX_ZOMBIE' undeclared (first use in this function)
> make[2]: *** [pppoe.o] Error 1
> make[2]: Leaving directory `/usr/src/linux-2.4.19-pre3/drivers/net'
> make[1]: *** [_modsubdir_net] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.4.19-pre3/drivers'
> make: *** [_mod_drivers] Error 2
>
>
> Regards,
> Stephan
>
[-- Attachment #2: pppoe.patch3 --]
[-- Type: text/x-patch, Size: 834 bytes --]
diff -r -u linux.old/include/linux/if_pppox.h linux/include/linux/if_pppox.h
--- linux.old/include/linux/if_pppox.h Thu Nov 22 14:47:14 2001
+++ linux/include/linux/if_pppox.h Fri Jan 25 07:39:15 2002
@@ -126,13 +126,14 @@
extern int pppox_channel_ioctl(struct ppp_channel *pc, unsigned int cmd,
unsigned long arg);
-/* PPPoE socket states */
+/* PPPoX socket states */
enum {
PPPOX_NONE = 0, /* initial state */
PPPOX_CONNECTED = 1, /* connection established ==TCP_ESTABLISHED */
PPPOX_BOUND = 2, /* bound to ppp device */
PPPOX_RELAY = 4, /* forwarding is enabled */
- PPPOX_DEAD = 8
+ PPPOX_ZOMBIE = 8, /* dead, but still bound to ppp device */
+ PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/
};
extern struct ppp_channel_ops pppoe_chan_ops;
^ permalink raw reply [flat|nested] only message in thread