summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-05-07 13:48:38 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-05-07 13:49:03 -0400
commit0a52ea653b209d69d552f953eb2f7e6506069818 (patch)
tree084fe25bf21212c4be1606fe5aa372062dbde5b2
parent413a52a0e216a89da1ed73536156c0307a4af26e (diff)
downloadpfsense-0a52ea653b209d69d552f953eb2f7e6506069818.zip
pfsense-0a52ea653b209d69d552f953eb2f7e6506069818.tar.gz
Fixed #6331
(cherry picked from commit 7e653b50c4a25b045121c026cd09ac4e567c0c42)
-rw-r--r--src/usr/local/www/interfaces.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 4a45e75..b7df85b 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -456,7 +456,7 @@ if ($_POST['apply']) {
/* call interface_track6_configure with linkup true so
IPv6 IPs are added back. dhcp6c needs a HUP. Can't
just call interface_configure with linkup true as
- that skips bridge membership addition.
+ that skips bridge membership addition.
*/
$wancfg = $config['interfaces'][$ifapply];
interface_track6_configure($ifapply, $wancfg, true);
@@ -1788,7 +1788,7 @@ if (count($mediaopts_list) > 0) {
$section->addInput(new Form_Select(
'mediaopt',
'Speed and Duplex',
- rtrim($mediaopt_from_config),
+ rtrim($config['interfaces'][$if]['media'] . ' ' . $config['interfaces'][$if]['mediaopt']),
build_mediaopts_list()
))->setHelp('Explicitly set speed and duplex mode for this interface.' . '<br />' .
'WARNING: MUST be set to autoselect (automatically negotiate speed) unless the port this interface connects to has its speed and duplex forced.');
OpenPOWER on IntegriCloud