mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-01 19:40:16 +02:00
5cae7371a7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32463 3c298f89-4303-0410-b956-a3cf2f4a3e73
26 lines
993 B
Diff
26 lines
993 B
Diff
pppd: Cap MTU to the user configured value
|
|
|
|
This patchs caps the calculated MTU value in lcp.c to the user specified "mru"
|
|
option value. Without this patch pppd would advertise a different MTU value
|
|
compared to what is set on the local interface in some cases.
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
|
|
|
|
--- a/pppd/lcp.c
|
|
+++ b/pppd/lcp.c
|
|
@@ -1904,12 +1904,12 @@ lcp_up(f)
|
|
* 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);
|