summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-03-13 03:15:10 -0500
committerChris Buechler <cmb@pfsense.org>2015-03-13 03:15:10 -0500
commitae2db699d60e7f397d5ac39deb4b1d5c52bc907b (patch)
tree8ed80c4a386990b93a53ebf85b6c0d7b6cb50cc2
parent9b65fdd0cee2c408dc7ef03d53de964d308eba35 (diff)
downloadpfsense-ae2db699d60e7f397d5ac39deb4b1d5c52bc907b.zip
pfsense-ae2db699d60e7f397d5ac39deb4b1d5c52bc907b.tar.gz
txpower was disabled for good reason it would appear, it triggers syntax errors in some configurations. Disable it again since it's been disabled for years, and comment out the user-facing config portion for now since it doesn't do anything. Ticket #4516
-rw-r--r--etc/inc/interfaces.inc4
-rw-r--r--usr/local/www/interfaces.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 8fbedb9..5571de1 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2416,9 +2416,11 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) {
}
/* handle txpower setting */
+ // or don't. this has issues at the moment.
+ /*
if($wlcfg['txpower'] <> "" && is_numeric($wlcfg['txpower'])) {
$wlcmd[] = "txpower " . escapeshellarg($wlcfg['txpower']);
- }
+ }*/
/* handle wme option */
if(isset($wlcfg['wme']['enable'])) {
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 0e32d7f..2248aaa 100644
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -2986,6 +2986,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
<?php else: ?>
<input name="protmode" type="hidden" id="protmode" value="off" />
<?php endif; ?>
+ <?php /* txpower is disabled because of issues with it.
<tr>
<td valign="top" class="vncellreq"><?=gettext("Transmit power"); ?></td>
<td class="vtable">
@@ -3002,7 +3003,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
</select><br />
<?=gettext("Note: Typically only a few discreet power settings are available and the driver will use the setting closest to the specified value. Not all adapters support changing the transmit power setting."); ?>
</td>
- </tr>
+ </tr>*/
+ ?>
<tr>
<td valign="top" class="vncellreq"><?=gettext("Channel"); ?></td>
<td class="vtable">
OpenPOWER on IntegriCloud