Merge remote branch 'mainline/master'

3 files changed, 40 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">
diff --git a/usr/share/skel/dot.tcshrc b/usr/share/skel/dot.tcshrc
new file mode 100644
index 0000000..97ca003
--- /dev/null
+++ b/usr/share/skel/dot.tcshrc
@@ -0,0 +1,5 @@
+set prompt="%{\033[0;1;33m%}[%{\033[0;1;37m%}`cat /etc/version`%{\033[0;1;33m%}]%{\033[0;1;33m%}%B[%{\033[0;1;37m%}%n%{\033[0;1;31m%}@%{\033[0;1;37m%}%M%{\033[0;1;33m%}]%{\033[0;1;32m%}%b%/%{\033[0;1;33m%}(%{\033[0;1;37m%}%h%{\033[0;1;33m%})%{\033[0;1;36m%}%{\033[0;1;31m%}:%{\033[0;40;37m%} "
+set autologout="0"
+set autolist set color set colorcat
+setenv CLICOLOR "true"
+setenv LSCOLORS "exfxcxdxbxegedabagacad"