diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-20 22:36:38 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-20 22:36:38 +0000 |
commit | 9137c11605e9bd0f7cc67895fd852e0b04cb672d (patch) | |
tree | 1796065955c8d3cb89a35b12741566a7198d93fd /package/ppp/patches/100-debian_close_dev_ppp.patch | |
parent | 89127a67f2707136d0219cba44138aa65889ebef (diff) | |
download | master-31e0f0ae-9137c11605e9bd0f7cc67895fd852e0b04cb672d.tar.gz master-31e0f0ae-9137c11605e9bd0f7cc67895fd852e0b04cb672d.tar.bz2 master-31e0f0ae-9137c11605e9bd0f7cc67895fd852e0b04cb672d.zip |
update ppp to v2.4.4 (#5102)
SVN-Revision: 15955
Diffstat (limited to 'package/ppp/patches/100-debian_close_dev_ppp.patch')
-rw-r--r-- | package/ppp/patches/100-debian_close_dev_ppp.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/ppp/patches/100-debian_close_dev_ppp.patch b/package/ppp/patches/100-debian_close_dev_ppp.patch deleted file mode 100644 index 4091c60b37..0000000000 --- a/package/ppp/patches/100-debian_close_dev_ppp.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Simon Peter <dn.tlp@gmx.net> -Subject: Bug#306261: pppd does not properly close /dev/ppp on persist - -When using the kernel PPPoE driver, pppd never -closes /dev/ppp when the link has come down. - -It opens superfluous fds to the device each time it re-opens the -connection, with the unclosed ones falsely reported always ready for -data by select(). - -This makes pppd eat up 100% CPU time after the first persist because of -the always instantly returning select() on the unclosed fds. - -The problem also occurs with the upstream version, but does not occur -when a pty/tty device is used for the ppp connection. - - -Index: ppp-2.4.3/pppd/sys-linux.c -=================================================================== ---- ppp-2.4.3.orig/pppd/sys-linux.c 2007-06-04 13:22:08.527558896 +0200 -+++ ppp-2.4.3/pppd/sys-linux.c 2007-06-04 13:22:08.807516336 +0200 -@@ -453,6 +453,13 @@ - if (new_style_driver) { - int flags; - -+ /* if a ppp_fd is already open, close it first */ -+ if(ppp_fd > 0) { -+ close(ppp_fd); -+ remove_fd(ppp_fd); -+ ppp_fd = -1; -+ } -+ - /* Open an instance of /dev/ppp and connect the channel to it */ - if (ioctl(fd, PPPIOCGCHAN, &chindex) == -1) { - error("Couldn't get channel number: %m"); |