diff options
author | Felix Fietkau <nbd@openwrt.org> | 2005-07-12 09:38:18 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2005-07-12 09:38:18 +0000 |
commit | dc40819709f16a94de44d8d24264b6ac3e823fc9 (patch) | |
tree | 6b99cd941fb8b2c6d47099672a22c87ab89c590e /package/ppp/patches/106-debian_pppoatm_fix_mtu.patch | |
parent | 96e5e35126ea226c526a6a8d84c8af6f70f2e074 (diff) | |
download | upstream-dc40819709f16a94de44d8d24264b6ac3e823fc9.tar.gz upstream-dc40819709f16a94de44d8d24264b6ac3e823fc9.tar.bz2 upstream-dc40819709f16a94de44d8d24264b6ac3e823fc9.zip |
add a lot of debian fixes to ppp (should fix persist and demand, too), clean up patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1417 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/patches/106-debian_pppoatm_fix_mtu.patch')
-rw-r--r-- | package/ppp/patches/106-debian_pppoatm_fix_mtu.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch new file mode 100644 index 0000000000..ef28b5cf2b --- /dev/null +++ b/package/ppp/patches/106-debian_pppoatm_fix_mtu.patch @@ -0,0 +1,31 @@ +diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c +--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 02:00:28.000000000 +0200 ++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-05-04 01:59:11.000000000 +0200 +@@ -183,8 +183,11 @@ static void send_config_pppoa(int mtu, + int sock; + struct ifreq ifr; + +- if (mtu > pppoatm_max_mtu) +- error("Couldn't increase MTU to %d", mtu); ++ if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) { ++ warn("Couldn't increase MTU to %d. Using %d", ++ mtu, pppoatm_max_mtu); ++ mtu = pppoatm_max_mtu; ++ } + + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) +@@ -202,8 +205,11 @@ static void recv_config_pppoa(int mru, + int pcomp, + int accomp) + { +- if (mru > pppoatm_max_mru) +- error("Couldn't increase MRU to %d", mru); ++ if (pppoatm_max_mru && mru > pppoatm_max_mru) { ++ warn("Couldn't increase MRU to %d. Using %d", ++ mru, pppoatm_max_mru); ++ mru = pppoatm_max_mru; ++ } + } + + void plugin_init(void) |