aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-02 02:24:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-02 02:24:38 +0000
commit86f609804f0bb53e2a0fa8bde2607f2d8399e0bf (patch)
tree1101eace0b89447c94111ca0a45428226c48e153 /package/ppp
parenteb502bf450a17d5d482726f9b6c4e36b588b7bee (diff)
downloadupstream-86f609804f0bb53e2a0fa8bde2607f2d8399e0bf.tar.gz
upstream-86f609804f0bb53e2a0fa8bde2607f2d8399e0bf.tar.bz2
upstream-86f609804f0bb53e2a0fa8bde2607f2d8399e0bf.zip
ppp: fix fallout from the size reduction patch (thx, frogonwheels)
SVN-Revision: 26398
Diffstat (limited to 'package/ppp')
-rw-r--r--package/ppp/patches/400-simplify_kernel_checks.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/package/ppp/patches/400-simplify_kernel_checks.patch b/package/ppp/patches/400-simplify_kernel_checks.patch
index 03591a897c..e82996c5f7 100644
--- a/package/ppp/patches/400-simplify_kernel_checks.patch
+++ b/package/ppp/patches/400-simplify_kernel_checks.patch
@@ -90,3 +90,43 @@
if (sfd < 0)
return 0;
+--- a/pppd/plugins/pppoatm/pppoatm.c
++++ b/pppd/plugins/pppoatm/pppoatm.c
+@@ -210,14 +210,6 @@ static void recv_config_pppoa(int mru,
+
+ void plugin_init(void)
+ {
+-#ifdef linux
+- extern int new_style_driver; /* From sys-linux.c */
+- if (!ppp_available() && !new_style_driver)
+- fatal("Kernel doesn't support ppp_generic - "
+- "needed for PPPoATM");
+-#else
+- fatal("No PPPoATM support on this OS");
+-#endif
+ add_options(pppoa_options);
+ }
+
+--- a/pppd/plugins/rp-pppoe/plugin.c
++++ b/pppd/plugins/rp-pppoe/plugin.c
+@@ -55,9 +55,6 @@ static char const RCSID[] =
+
+ char pppd_version[] = VERSION;
+
+-/* From sys-linux.c in pppd -- MUST FIX THIS! */
+-extern int new_style_driver;
+-
+ char *pppd_pppoe_service = NULL;
+ static char *acName = NULL;
+ static char *existingSession = NULL;
+@@ -312,10 +309,6 @@ PPPoEDevnameHook(char *cmd, char **argv,
+ void
+ plugin_init(void)
+ {
+- if (!ppp_available() && !new_style_driver) {
+- fatal("Linux kernel does not support PPPoE -- are you running 2.4.x?");
+- }
+-
+ add_options(Options);
+ }
+