From cf732b0e2fbd6bad76730eef580dd151a687f2ca Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 5 Feb 2016 16:40:06 +0100 Subject: [PATCH] (legacy) zap get_interface_mtu --- src/etc/inc/interfaces.inc | 25 ++++++------------------- src/etc/inc/services.inc | 4 ++-- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 6ec8a1d9a..a465b13bc 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -723,8 +723,8 @@ function interface_bridge_add_member($bridgeif, $interface) return; } - $mtu = get_interface_mtu($bridgeif); - $mtum = get_interface_mtu($interface); + $mtu = legacy_interface_stats($bridgeif)['mtu']; + $mtum = legacy_interface_stats($interface)['mtu']; if ($mtu != $mtum && !(substr($interface, 0, 3) == "gif" && $mtu <= 1500)) { legacy_interface_mtu($interface, $mtu); @@ -2908,11 +2908,11 @@ function interface_vlan_adapt_mtu($vlanifs, $mtu) legacy_interface_mtu($vlan['vlanif'], $mtu); } } else { - if (get_interface_mtu($vlan['vlanif']) != $mtu) { + if (legacy_interface_stats($vlan['vlanif'])['mtu'] != $mtu) { legacy_interface_mtu($vlan['vlanif'], $mtu); } } - } elseif (get_interface_mtu($vlan['vlanif']) != $mtu) { + } elseif (legacy_interface_stats($vlan['vlanif'])['mtu'] != $mtu) { legacy_interface_mtu($vlan['vlanif'], $mtu); } } @@ -3095,7 +3095,7 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven } if ($wancfg['mtu'] > $parentmtu) { - if (get_interface_mtu($realhwif) != $wancfg['mtu']) { + if (legacy_interface_stats($realhwif)['mtu'] != $wancfg['mtu']) { legacy_interface_mtu($realhwif, $wancfg['mtu']); } @@ -3105,7 +3105,7 @@ function interface_configure($interface = 'wan', $reloadall = false, $linkupeven legacy_interface_mtu($realif, $wancfg['mtu']); } } else { - if ($wancfg['mtu'] != get_interface_mtu($realif)) { + if ($wancfg['mtu'] != legacy_interface_stats($realif)['mtu']) { legacy_interface_mtu($realif, $wancfg['mtu']); } @@ -4977,19 +4977,6 @@ function is_interface_wireless($interface) } - -/****f* interfaces/get_interface_mtu - * NAME - * get_interface_mtu - Return the mtu of an interface - * RESULT - * $tmp - Returns the mtu of an interface - ******/ -function get_interface_mtu($interface) -{ - $mtu = pfSense_get_interface_addresses($interface); - return $mtu['mtu']; -} - function get_interface_mac($interface) { $macinfo = pfSense_get_interface_addresses($interface); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index c3e0e3f15..0e23647f6 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -160,7 +160,7 @@ function services_radvd_configure($blacklist = array()) $radvdconf .= "\tAdvSendAdvert on;\n"; $radvdconf .= "\tMinRtrAdvInterval 5;\n"; $radvdconf .= "\tMaxRtrAdvInterval 20;\n"; - $mtu = get_interface_mtu($realif); + $mtu = legacy_interface_stats($realif)['mtu']; if (is_numeric($mtu)) $radvdconf .= "\tAdvLinkMTU {$mtu};\n"; else @@ -292,7 +292,7 @@ function services_radvd_configure($blacklist = array()) $radvdconf .= "\tAdvSendAdvert on;\n"; $radvdconf .= "\tMinRtrAdvInterval 3;\n"; $radvdconf .= "\tMaxRtrAdvInterval 10;\n"; - $mtu = get_interface_mtu($realif); + $mtu = legacy_interface_stats($realif)['mtu']; if (is_numeric($mtu)) $radvdconf .= "\tAdvLinkMTU {$mtu};\n"; else