diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-30 09:13:28 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-06-30 09:13:28 -0300 |
commit | 54009f588b7445945f0720c7e96ff4b79ba64130 (patch) | |
tree | 134352167134e9ab609cc86745073ccd10aa77fe /usr/local | |
parent | 6c1c761692aa3939c8877ac9b13e2f72493c29ae (diff) | |
parent | 29293dce60bdf28fa232b33625505436c5df33da (diff) | |
download | pfsense-54009f588b7445945f0720c7e96ff4b79ba64130.zip pfsense-54009f588b7445945f0720c7e96ff4b79ba64130.tar.gz |
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 4 | ||||
-rw-r--r-- | usr/local/www/system_advanced_network.php | 36 |
2 files changed, 35 insertions, 5 deletions
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index bfa5061..840d6bf 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -132,7 +132,7 @@ if ($_POST) { else unset($config['system']['enablesshd']); - $sshd_keyonly = $config['system']['sshdkeyonly']; + $sshd_keyonly = isset($config['system']['sshdkeyonly']); if ($_POST['sshdkeyonly']) $config['system']['sshdkeyonly'] = true; else @@ -157,7 +157,7 @@ if ($_POST) { if ($port) $url = "{$prot}://{$host}:{$port}/system_advanced_admin.php"; else - $url = "{$prot}://{$host}/system.php"; + $url = "{$prot}://{$host}/system_advanced_admin.php"; } write_config(); diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index d744a47..6c67e30 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -54,6 +54,8 @@ $pconfig['ipv6allow'] = isset($config['system']['ipv6allow']); $pconfig['polling_enable'] = isset($config['system']['polling']); $pconfig['sharednet'] = $config['system']['sharednet']; $pconfig['disablechecksumoffloading'] = isset($config['system']['disablechecksumoffloading']); +$pconfig['disablesegmentationoffloading'] = isset($config['system']['disablesegmentationoffloading']); +$pconfig['disablelargereceiveoffloading'] = isset($config['system']['disablelargereceiveoffloading']); $pconfig['flowtable'] = false; $pconfig['flowtable'] = isset($config['system']['flowtable']); @@ -111,12 +113,24 @@ if ($_POST) { if($_POST['disablechecksumoffloading'] == "yes") { $config['system']['disablechecksumoffloading'] = $_POST['disablechecksumoffloading']; - setup_microcode(); } else { unset($config['system']['disablechecksumoffloading']); - setup_microcode(); } + if($_POST['disablesegmentationoffloading'] == "yes") { + $config['system']['disablesegmentationoffloading'] = $_POST['disablesegmentationoffloading']; + } else { + unset($config['system']['disablesegmentationoffloading']); + } + + if($_POST['disablelargereceiveoffloading'] == "yes") { + $config['system']['disablelargereceiveoffloading'] = $_POST['disablelargereceiveoffloading']; + } else { + unset($config['system']['disablelargereceiveoffloading']); + } + + setup_microcode(); + // Write out configuration (config.xml) write_config(); @@ -234,7 +248,23 @@ function enable_change(enable_over) { <strong><?=gettext("Disable hardware checksum offload"); ?></strong><br> <?=gettext("Checking this option will disable hardware checksum offloading. Checksum offloading is broken in some hardware, particularly some Realtek cards. Rarely, drivers may have problems with checksum offloading and some specific NICs."); ?> </td> - </tr> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Hardware TCP Segmentation Offloading"); ?></td> + <td width="78%" class="vtable"> + <input name="disablesegmentationoffloading" type="checkbox" id="disablesegmentationoffloading" value="yes" <?php if (isset($config['system']['disablesegmentationoffloading'])) echo "checked"; ?> /> + <strong><?=gettext("Disable hardware TCP segmentation offload"); ?></strong><br> + <?=gettext("Checking this option will disable hardware TCP segmentation offloading (TSO, TSO4, TSO6). This offloading is broken in some hardware drivers, and may impact performance with some specific NICs."); ?> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Hardware Large Receive Offloading"); ?></td> + <td width="78%" class="vtable"> + <input name="disablelargereceiveoffloading" type="checkbox" id="disablelargereceiveoffloading" value="yes" <?php if (isset($config['system']['disablelargereceiveoffloading'])) echo "checked"; ?> /> + <strong><?=gettext("Disable hardware large receive offload"); ?></strong><br> + <?=gettext("Checking this option will disable hardware large receive offloading (LRO). This offloading is broken in some hardware drivers, and may impact performance with some specific NICs.."); ?> + </td> + </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("ARP Handling"); ?></td> <td width="78%" class="vtable"> |