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/207-lcp_mtu_max.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/207-lcp_mtu_max.patch')
-rw-r--r-- | package/ppp/patches/207-lcp_mtu_max.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/package/ppp/patches/207-lcp_mtu_max.patch b/package/ppp/patches/207-lcp_mtu_max.patch new file mode 100644 index 0000000000..9977f0193d --- /dev/null +++ b/package/ppp/patches/207-lcp_mtu_max.patch @@ -0,0 +1,36 @@ +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); +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); |