From 08fe7601ef535aa354255658215475223a23ddee Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 27 May 2019 13:43:58 -0300
Subject: [PATCH] Fix #9548: Do not rely on VLANMTU flag

Do not consider VLAN capable only interfaces that have VLANMTU flag.
This flag is used to determine if that interface can do 1500 MTU even
with VLANG tag set.
---
 src/etc/inc/config.console.inc             | 15 +++++++--------
 src/usr/local/www/interfaces_qinq_edit.php |  4 +---
 src/usr/local/www/interfaces_vlan_edit.php |  9 ++++-----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc
index 0b769de168..fefcd4d31a 100644
--- a/src/etc/inc/config.console.inc
+++ b/src/etc/inc/config.console.inc
@@ -454,11 +454,9 @@ function vlan_setup() {
 		} else {
 			$vlan_capable = 0;
 			foreach ($iflist as $iface => $ifa) {
-				if (is_jumbo_capable($iface)) {
-					echo sprintf("% -8s%s%s\n", $iface, $ifa['mac'],
-						$ifa['up'] ? "   (up)" : "");
-					$vlan_capable++;
-				}
+				echo sprintf("% -8s%s%s\n", $iface, $ifa['mac'],
+				    $ifa['up'] ? "   (up)" : "");
+				$vlan_capable++;
 			}
 		}
 
@@ -471,9 +469,10 @@ function vlan_setup() {
 		$vlan['if'] = chop(fgets($fp));
 
 		if ($vlan['if']) {
-			if (!array_key_exists($vlan['if'], $iflist) ||
-			    !is_jumbo_capable($vlan['if'])) {
-				printf(gettext('%1$sInvalid interface name \'%2$s\'%3$s'), "\n", $vlan['if'], "\n");
+			if (!array_key_exists($vlan['if'], $iflist)) {
+				printf(gettext(
+				    '%1$sInvalid interface name \'%2$s\'%3$s'),
+				    "\n", $vlan['if'], "\n");
 				continue;
 			}
 		} else {
diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php
index a425e301e4..4d3fc56602 100644
--- a/src/usr/local/www/interfaces_qinq_edit.php
+++ b/src/usr/local/www/interfaces_qinq_edit.php
@@ -241,9 +241,7 @@ function build_parent_list() {
 	$list = array();
 
 	foreach ($portlist as $ifn => $ifinfo) {
-		if (is_jumbo_capable($ifn)) {
-			$list[$ifn] = $ifn . ' (' . $ifinfo['mac'] . ')';
-		}
+		$list[$ifn] = $ifn . ' (' . $ifinfo['mac'] . ')';
 	}
 
 	return($list);
diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php
index c4e61b20f8..fe84397a2f 100644
--- a/src/usr/local/www/interfaces_vlan_edit.php
+++ b/src/usr/local/www/interfaces_vlan_edit.php
@@ -157,11 +157,10 @@ function build_interfaces_list() {
 	$list = array();
 
 	foreach ($portlist as $ifn => $ifinfo) {
-		if (is_jumbo_capable($ifn)) {
-			$list[$ifn] = $ifn . " (" . $ifinfo['mac'] . ")";
-			$iface = convert_real_interface_to_friendly_interface_name($ifn);
-			if (isset($iface) && strlen($iface) > 0)
-				$list[$ifn] .= " - $iface";
+		$list[$ifn] = $ifn . " (" . $ifinfo['mac'] . ")";
+		$iface = convert_real_interface_to_friendly_interface_name($ifn);
+		if (isset($iface) && strlen($iface) > 0) {
+			$list[$ifn] .= " - $iface";
 		}
 	}