diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-05-21 10:48:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-05-21 10:48:24 +0000 |
| commit | ed5472e86882f5358d159df645c5ed8f3829b7e8 (patch) | |
| tree | 5a849a581e1b9494579dc7a5c380c5efd7102af5 /package/ppp/patches/207-lcp_mtu_max.patch | |
| parent | a32b336a3bc5ab07f808f4b1c2a1dcee16e2b553 (diff) | |
| download | upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.tar.gz upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.tar.bz2 upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.zip | |
[ppp] Make patches apply agagin.
The deleted parts were two times in the patches.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15957 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/patches/207-lcp_mtu_max.patch')
| -rw-r--r-- | package/ppp/patches/207-lcp_mtu_max.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/package/ppp/patches/207-lcp_mtu_max.patch b/package/ppp/patches/207-lcp_mtu_max.patch index 9977f0193d..b57284f28c 100644 --- a/package/ppp/patches/207-lcp_mtu_max.patch +++ b/package/ppp/patches/207-lcp_mtu_max.patch @@ -16,21 +16,3 @@ diff -Naur ppp-2.4.4.orig/pppd/lcp.c ppp-2.4.4/pppd/lcp.c ppp_send_config(f->unit, mtu, (ho->neg_asyncmap? ho->asyncmap: 0xffffffff), ho->neg_pcompression, ho->neg_accompression); -diff -Naur ppp-2.4.4.orig/pppd/lcp.c ppp-2.4.4/pppd/lcp.c ---- ppp-2.4.4.orig/pppd/lcp.c 2009-05-07 22:24:09.000000000 -0400 -+++ ppp-2.4.4/pppd/lcp.c 2009-05-07 22:26:57.000000000 -0400 -@@ -1904,12 +1904,12 @@ - * the interface MTU is set to the lowest of that, the - * MTU we want to use, and our link MRU. - */ -- mtu = ho->neg_mru? ho->mru: PPP_MRU; -+ mtu = MIN(ho->neg_mru? ho->mru: PPP_MRU, ao->mru); - mru = go->neg_mru? MAX(wo->mru, go->mru): PPP_MRU; - #ifdef HAVE_MULTILINK - if (!(multilink && go->neg_mrru && ho->neg_mrru)) - #endif /* HAVE_MULTILINK */ -- netif_set_mtu(f->unit, MIN(MIN(mtu, mru), ao->mru)); -+ netif_set_mtu(f->unit, MIN(mtu, mru)); - ppp_send_config(f->unit, mtu, - (ho->neg_asyncmap? ho->asyncmap: 0xffffffff), - ho->neg_pcompression, ho->neg_accompression); |