aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-05-13 15:26:56 +0200
committerHans Dedecker <dedeckeh@gmail.com>2019-05-13 15:34:42 +0200
commit06403981e1f2daf6bbcf05f5f2d2205d68240861 (patch)
tree35ea47bde472288855eacec36d70e4e6d700d96a /package/network/services/ppp/patches/400-simplify_kernel_checks.patch
parent655fff15718318af578b8e3d98dd056f5596bf12 (diff)
downloadupstream-06403981e1f2daf6bbcf05f5f2d2205d68240861.tar.gz
upstream-06403981e1f2daf6bbcf05f5f2d2205d68240861.tar.bz2
upstream-06403981e1f2daf6bbcf05f5f2d2205d68240861.zip
ppp: update to version 2.4.7.git-2019-05-06
fcb076c Various fixes for errors found by coverity static analysis (#109) d98ab38 Merge branch 'pppd_print_changes' of https://github.com/nlhintz/ppp into nlhintz-pppd_print_changes Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/services/ppp/patches/400-simplify_kernel_checks.patch')
-rw-r--r--package/network/services/ppp/patches/400-simplify_kernel_checks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
index 05cbdb11ba..fcde352764 100644
--- a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
+++ b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch
@@ -80,7 +80,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
/*
* This is the PPP device. Validate the version of the driver at this
-@@ -2727,6 +2734,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
+@@ -2730,6 +2737,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
}
#endif /* TIOCGPTN */
@@ -88,7 +88,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
if (sfd < 0) {
/* the old way - scan through the pty name space */
for (i = 0; i < 64; ++i) {
-@@ -2745,6 +2753,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
+@@ -2748,6 +2756,7 @@ get_pty(master_fdp, slave_fdp, slave_nam
}
}
}
@@ -138,7 +138,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
info("RP-PPPoE plugin version %s compiled against pppd %s",
--- a/pppd/plugins/pppol2tp/pppol2tp.c
+++ b/pppd/plugins/pppol2tp/pppol2tp.c
-@@ -486,12 +486,7 @@ static void pppol2tp_cleanup(void)
+@@ -490,12 +490,7 @@ static void pppol2tp_cleanup(void)
void plugin_init(void)
{