summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-03 19:39:20 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-03 19:39:20 +0000
commit6c6c3517c7c4a84f57f57a275634ac382afe843d (patch)
tree793ad10b996ddec429380c9079285808b5defe00 /mdk-stage1
parentfad2c679c76105eac7164d920862050e2cca5b82 (diff)
downloaddrakx-backup-do-not-use-6c6c3517c7c4a84f57f57a275634ac382afe843d.tar
drakx-backup-do-not-use-6c6c3517c7c4a84f57f57a275634ac382afe843d.tar.gz
drakx-backup-do-not-use-6c6c3517c7c4a84f57f57a275634ac382afe843d.tar.bz2
drakx-backup-do-not-use-6c6c3517c7c4a84f57f57a275634ac382afe843d.tar.xz
drakx-backup-do-not-use-6c6c3517c7c4a84f57f57a275634ac382afe843d.zip
further reduce diff with ppp-2.4.5
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/ppp/pppd/sys-linux.c3
-rw-r--r--mdk-stage1/ppp/pppd/sys-solaris.c13
2 files changed, 4 insertions, 12 deletions
diff --git a/mdk-stage1/ppp/pppd/sys-linux.c b/mdk-stage1/ppp/pppd/sys-linux.c
index beb6a3cc0..2eeada621 100644
--- a/mdk-stage1/ppp/pppd/sys-linux.c
+++ b/mdk-stage1/ppp/pppd/sys-linux.c
@@ -2505,8 +2505,7 @@ sifnpmode(u, proto, mode)
npi.mode = mode;
if (ioctl(ppp_dev_fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) {
if (! ok_error (errno))
- error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)",
- proto, mode, errno);
+ error("ioctl(PPPIOCSNPMODE, %d, %d): %m (%d)", proto, mode, errno);
return 0;
}
return 1;
diff --git a/mdk-stage1/ppp/pppd/sys-solaris.c b/mdk-stage1/ppp/pppd/sys-solaris.c
index 60b3003ed..5a2089bc4 100644
--- a/mdk-stage1/ppp/pppd/sys-solaris.c
+++ b/mdk-stage1/ppp/pppd/sys-solaris.c
@@ -1520,7 +1520,7 @@ tty_send_config(mtu, asyncmap, pcomp, accomp)
}
/*
- * ppp_set_xaccm - set the extended transmit ACCM for the interface.
+ * tty_set_xaccm - set the extended transmit ACCM for the interface.
*/
void
tty_set_xaccm(accm)
@@ -1537,7 +1537,7 @@ tty_set_xaccm(accm)
}
/*
- * ppp_recv_config - configure the receive-side characteristics of
+ * tty_recv_config - configure the receive-side characteristics of
* the ppp interface.
*/
void
@@ -1956,12 +1956,6 @@ sifaddr(u, o, h, m)
error("Couldn't set remote IP address: %m");
ret = 0;
}
-#if 0 /* now done in ppp_send_config */
- ifr.ifr_metric = link_mtu;
- if (ioctl(ipfd, SIOCSIFMTU, &ifr) < 0) {
- error("Couldn't set IP MTU: %m");
- }
-#endif
remote_addr = h;
return ret;
@@ -2179,7 +2173,7 @@ get_hw_addr_dlpi(name, hwaddr)
char *name;
struct sockaddr *hwaddr;
{
- char *p, *q;
+ char *q;
int unit, iffd, adrlen;
unsigned char *adrp;
char ifdev[24];
@@ -2698,7 +2692,6 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
{
int mfd, sfd;
char *pty_name;
- struct termios tios;
mfd = open("/dev/ptmx", O_RDWR);
if (mfd < 0) {