lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(legacy) make disablevlanhwfilter optional + redirect on successful save in system_advanced_network.php

Browse Source
This commit is contained in:
Ad Schellevis 2016-03-02 17:11:26 +01:00
parent 8c02d8cbd0
commit 2fc3baa930
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/etc/inc/interfaces.inc
View File

@ -272,13 +272,16 @@ function interface_vlan_configure(&$vlan)
}
}
foreach ($members as $member) {
// set one tag at a time to avoid driver issues
foreach (array('vlanmtu', 'vlanhwtag', 'vlanhwfilter', 'vlanhwcsum', 'vlanhwtso') as $tag) {
if (!isset($config['system']['disablevlanhwfilter'])) {
legacy_interface_flags($member, $tag);
} else {
legacy_interface_flags($member, '-'.$tag);
// disable/enable hardware vlan tags, will be skipped when "Leave default" (option 2) is selected
if (!isset($config['system']['disablevlanhwfilter']) || $config['system']['disablevlanhwfilter'] == 1) {
foreach ($members as $member) {
// set one tag at a time to avoid driver issues
foreach (array('vlanmtu', 'vlanhwtag', 'vlanhwfilter', 'vlanhwcsum', 'vlanhwtso') as $tag) {
if (!isset($config['system']['disablevlanhwfilter'])) {
legacy_interface_flags($member, $tag);
} else {
legacy_interface_flags($member, '-'.$tag);
}
}
}
}

26
src/www/system_advanced_network.php
View File

@ -46,7 +46,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['disablechecksumoffloading'] = isset($config['system']['disablechecksumoffloading']);
$pconfig['disablesegmentationoffloading'] = isset($config['system']['disablesegmentationoffloading']);
$pconfig['disablelargereceiveoffloading'] = isset($config['system']['disablelargereceiveoffloading']);
$pconfig['disablevlanhwfilter'] = isset($config['system']['disablevlanhwfilter']);
if (!isset($config['system']['disablevlanhwfilter'])) {
$pconfig['disablevlanhwfilter'] = "0";
} else {
$pconfig['disablevlanhwfilter'] = $config['system']['disablevlanhwfilter'];
}
$pconfig['sharednet'] = isset($config['system']['sharednet']);
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pconfig = $_POST;
@ -107,13 +111,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
if (!empty($_POST['disablevlanhwfilter'])) {
$config['system']['disablevlanhwfilter'] = true;
$config['system']['disablevlanhwfilter'] = $pconfig['disablevlanhwfilter'];
} elseif(isset($config['system']['disablevlanhwfilter'])) {
unset($config['system']['disablevlanhwfilter']);
}
if (count($input_errors) == 0) {
setup_polling();
if (isset($config['system']['sharednet'])) {
system_disable_arp_wrong_if();
@ -126,10 +129,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
write_config();
$savemsg = get_std_save_message();
prefer_ipv4_or_ipv6();
filter_configure();
header("Location: system_advanced_network.php");
exit;
}
}
@ -278,8 +281,17 @@ include("head.inc");
<tr>
<td><a id="help_for_disablevlanhwfilter" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VLAN Hardware Filtering"); ?></td>
<td>
<input name="disablevlanhwfilter" type="checkbox" id="disablevlanhwfilter" value="yes" <?= !empty($pconfig['disablevlanhwfilter']) ? "checked=\"checked\"" : "";?>/>
<strong><?=gettext("Disable VLAN Hardware Filtering"); ?></strong><br />
<select name="disablevlanhwfilter" class="selectpicker">
<option value="0" <?=$pconfig['disablevlanhwfilter'] == "0" ? "selected=\"selected\"" : "";?> >
<?=gettext("Enable VLAN Hardware Filtering");?>
</option>
<option value="1" <?=$pconfig['disablevlanhwfilter'] == "1" ? "selected=\"selected\"" : "";?> >
<?=gettext("Disable VLAN Hardware Filtering"); ?>
</option>
<option value="2" <?=$pconfig['disablevlanhwfilter'] == "2" ? "selected=\"selected\"" : "";?> >
<?=gettext("Leave default");?>
</option>
</select>
<div class="hidden" for="help_for_disablevlanhwfilter">
<?=gettext("Checking this option will disable VLAN hardware filtering. This offloading is broken in some hardware drivers, and may impact performance with some specific NICs."); ?>
<br />