diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 13:51:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 13:51:36 +0000 |
| commit | 7fa3fe6741b08fb26058e92a43dfd9d3798d102a (patch) | |
| tree | a1e3e513ee443172b8936c89c1df1a09c21497fa /package/network/services/ppp/patches/400-simplify_kernel_checks.patch | |
| parent | 0f474633e146b30c1775d15ced6bdf8529b16863 (diff) | |
| download | master-31e0f0ae-7fa3fe6741b08fb26058e92a43dfd9d3798d102a.tar.gz master-31e0f0ae-7fa3fe6741b08fb26058e92a43dfd9d3798d102a.tar.bz2 master-31e0f0ae-7fa3fe6741b08fb26058e92a43dfd9d3798d102a.zip | |
pppd: fix build errors with musl
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39963
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.patch | 16 |
1 files changed, 8 insertions, 8 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 4494abac2e..89c5861878 100644 --- a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch +++ b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch @@ -10,7 +10,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -203,7 +203,7 @@ static int driver_is_old = 0; +@@ -196,7 +196,7 @@ static int driver_is_old = 0; static int restore_term = 0; /* 1 => we've munged the terminal */ static struct termios inittermios; /* Initial TTY termios */ @@ -19,7 +19,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> static char loop_name[20]; static unsigned char inbuf[512]; /* buffer for chars read from loopback */ -@@ -220,8 +220,8 @@ static int looped; /* 1 if using loop +@@ -213,8 +213,8 @@ static int looped; /* 1 if using loop static int link_mtu; /* mtu for the link (not bundle) */ static struct utsname utsname; /* for the kernel version */ @@ -29,7 +29,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> #define MAX_IFS 100 -@@ -1450,11 +1450,12 @@ int ccp_fatal_error (int unit) +@@ -1443,11 +1443,12 @@ int ccp_fatal_error (int unit) * * path_to_procfs - find the path to the proc file system mount point */ @@ -44,7 +44,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> struct mntent *mntent; FILE *fp; -@@ -1476,6 +1477,7 @@ static char *path_to_procfs(const char * +@@ -1469,6 +1470,7 @@ static char *path_to_procfs(const char * fclose (fp); } } @@ -52,7 +52,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> strlcpy(proc_path + proc_path_len, tail, sizeof(proc_path) - proc_path_len); -@@ -2128,15 +2130,19 @@ int ppp_available(void) +@@ -2121,15 +2123,19 @@ int ppp_available(void) int my_version, my_modification, my_patch; int osmaj, osmin, ospatch; @@ -72,7 +72,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> /* XXX should get from driver */ driver_version = 2; -@@ -2197,6 +2203,7 @@ int ppp_available(void) +@@ -2190,6 +2196,7 @@ int ppp_available(void) if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) ok = 0; @@ -80,7 +80,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> /* * This is the PPP device. Validate the version of the driver at this -@@ -2690,6 +2697,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2683,6 +2690,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } #endif /* TIOCGPTN */ @@ -88,7 +88,7 @@ Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> if (sfd < 0) { /* the old way - scan through the pty name space */ for (i = 0; i < 64; ++i) { -@@ -2708,6 +2716,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2701,6 +2709,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } } } |