diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-05-21 10:48:24 +0000 |
commit | b97b54291da149cf68a6db878aae2f92962e1cad (patch) | |
tree | f38b2d8c653a7677346f4b25e4f80e636a73ea42 /package/ppp/patches/108-debian_pppatm_fix_mtu.patch | |
parent | 9137c11605e9bd0f7cc67895fd852e0b04cb672d (diff) | |
download | upstream-b97b54291da149cf68a6db878aae2f92962e1cad.tar.gz upstream-b97b54291da149cf68a6db878aae2f92962e1cad.tar.bz2 upstream-b97b54291da149cf68a6db878aae2f92962e1cad.zip |
Make patches apply agagin. The deleted parts were two times in the patches.
SVN-Revision: 15957
Diffstat (limited to 'package/ppp/patches/108-debian_pppatm_fix_mtu.patch')
-rw-r--r-- | package/ppp/patches/108-debian_pppatm_fix_mtu.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch index 85daa6a903..ecf619a1cb 100644 --- a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch +++ b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch @@ -29,34 +29,3 @@ diff -Naur ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.4/pppd/plugins/ } void plugin_init(void) -diff -Naur ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c ---- ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c 2009-05-07 16:23:41.000000000 -0400 -+++ ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c 2009-05-07 16:23:57.000000000 -0400 -@@ -179,8 +179,11 @@ - 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) -@@ -198,8 +201,11 @@ - 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) |