--
Med venlig hilsen / Best regards
nkbj@image.dk
Niels Kristian Bech Jensen http://www.image.dk/~nkbj/
---------- Forwarded message ----------
Date: Tue, 2 Dec 1997 08:34:39 +0100 (MET)
From: Niels Kristian Bech Jensen <nkbj@image.dk>
To: linux-kernel@vger.rutgers.edu
Cc: linux-ppp@vger.rugters.edu
Subject: [2.1.69] Patch for ppp-2.2.0f
This is the minimum changes to get ppp-2.2.0f compiled (and working) under
2.1.69. Maybe it should replace the current patch in
linux/Documentation/networking/ppp.txt.
diff -urN ppp-2.2.0f.orig/pppd/main.c ppp-2.2.0f/pppd/main.c
--- ppp-2.2.0f.orig/pppd/main.c Tue Nov 21 07:53:48 1995
+++ ppp-2.2.0f/pppd/main.c Tue Dec 2 08:20:29 1997
@@ -164,13 +164,13 @@
char *argv[];
{
int i, nonblock;
- struct sigaction sa;
+ struct old_sigaction sa;
struct cmd *cmdp;
FILE *pidfile;
char *p;
struct passwd *pw;
struct timeval timo;
- sigset_t mask;
+ old_sigset_t mask;
p = ttyname(0);
if (p)
diff -urN ppp-2.2.0f.orig/pppd/sys-linux.c ppp-2.2.0f/pppd/sys-linux.c
--- ppp-2.2.0f.orig/pppd/sys-linux.c Sat Apr 13 07:02:53 1996
+++ ppp-2.2.0f/pppd/sys-linux.c Tue Dec 2 08:17:46 1997
@@ -927,8 +927,11 @@
if (ioctl(sockfd, SIOCADDRT, &rt) < 0)
{
+/* The new linux routing code doesn't like routes on down devices. */
+#if 0
syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
return (0);
+#endif
}
return 1;
}
diff -urN ppp-2.2.0f.orig/pppstats/pppstats.c ppp-2.2.0f/pppstats/pppstats.c
--- ppp-2.2.0f.orig/pppstats/pppstats.c Sat Sep 30 16:44:25 1995
+++ ppp-2.2.0f/pppstats/pppstats.c Tue Dec 2 08:19:49 1997
@@ -164,7 +164,7 @@
intpr()
{
register int line = 0;
- sigset_t oldmask, mask;
+ old_sigset_t oldmask, mask;
struct ppp_stats cur, old;
struct ppp_comp_stats ccs, ocs;
--
Med venlig hilsen / Best regards
nkbj@image.dk
Niels Kristian Bech Jensen http://www.image.dk/~nkbj/