From 73fc2ea0c080931fd8237753ed24530bad7f67c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20LU=C3=87I?= Date: Mon, 24 Nov 2014 22:45:30 +0100 Subject: [PATCH] Correct logic for lagg mtu. Also optimize and cleanup dead code --- etc/inc/interfaces.inc | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2dfa931ae8..5f15f61f4c 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -706,10 +706,10 @@ function interface_lagg_configure($lagg) { if ($ifdata['if'] != $laggif) continue; - if (isset($ifdata['mtu']) && !empty($ifdata['mtu'])) { + if (isset($ifdata['mtu']) && !empty($ifdata['mtu'])) $lagg_mtu = $ifdata['mtu']; - break; - } + + break; } } @@ -719,16 +719,6 @@ function interface_lagg_configure($lagg) { foreach ($members as $member) { $opts = pfSense_get_interface_addresses($member); $mtu = $opts['mtu']; - 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) @@ -741,10 +731,8 @@ function interface_lagg_configure($lagg) { if ($lagg_mtu == 0) $lagg_mtu = 1500; - $checklist = get_interface_list(); - foreach ($members as $member) { - if (!array_key_exists($member, $checklist)) + if (!does_interface_exist($member)) continue; /* make sure the parent interface is up */ pfSense_interface_mtu($member, $lagg_mtu);