diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2014-11-25 20:02:50 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2014-11-25 20:02:50 +0100 |
| commit | 2c4301fa6f60fee5f80b51f20177d7fc629e259a (patch) | |
| tree | be0daf3fb579c97b5a9c8e3ed097f6cdca4b4918 | |
| parent | ba8e4c8832f5d4e834c01acb7eecfeb430ae8033 (diff) | |
| download | pfsense-2c4301fa6f60fee5f80b51f20177d7fc629e259a.zip pfsense-2c4301fa6f60fee5f80b51f20177d7fc629e259a.tar.gz | |
Ticket #2786 handle the mtu on bridge same as on lagg. Cleanup some not needed code while here
| -rw-r--r-- | etc/inc/interfaces.inc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 4aed982..cf9f2b4 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -489,16 +489,6 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { if ($mtu <= 1500) continue; } - if (!isset($opts['caps']['txcsum'])) - $commontx = false; - if (!isset($opts['caps']['rxcsum'])) - $commonrx = false; - if (!isset($opts['caps']['tso4'])) - $commontso4 = false; - if (!isset($opts['caps']['tso6'])) - $commontso6 = false; - if (!isset($opts['caps']['lro'])) - $commonlro = false; if ($smallermtu == 0 && !empty($mtu)) $smallermtu = $mtu; else if (!empty($mtu) && $mtu < $smallermtu) @@ -520,6 +510,10 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { $bridge['bridgeif'] = $bridgeif; } + $bridgemtu = interface_find_child_cfgmtu($bridge['bridgeif']); + if ($bridgemtu > $smallermtu) + $smallermtu = $bridgemtu; + $checklist = get_configured_interface_list(); /* Add interfaces to bridge */ |
