summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/interfaces.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-10-12 12:39:29 -0300
committerRenato Botelho <renato@netgate.com>2016-10-12 12:39:29 -0300
commit9eab84482ef13ad48825d4be17dedb3011b5c04b (patch)
treebd12a258f38187d357dcc9496acee2f947fa3a53 /src/etc/inc/interfaces.inc
parentec6e6666aa9692302553d44bf5888141065eb3b4 (diff)
parent553de3973dfdb0539a64510666976d523a21f2f9 (diff)
downloadpfsense-9eab84482ef13ad48825d4be17dedb3011b5c04b.zip
pfsense-9eab84482ef13ad48825d4be17dedb3011b5c04b.tar.gz
Merge pull request #3169 from valneacsu/fix_wifi_channel_change
Diffstat (limited to 'src/etc/inc/interfaces.inc')
-rw-r--r--src/etc/inc/interfaces.inc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index a03c681..749d930 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2947,13 +2947,14 @@ EOD;
}
}
- /* 20150318 cmb - Note: the below no longer appears to be true on FreeBSD 10.x, so don't set
- * mode twice (for now at least). This can be removed entirely in the future if no problems are found
-
- * The mode must be specified in a separate command before ifconfig
- * will allow the mode and channel at the same time in the next. */
- //mwexec("/sbin/ifconfig " . escapeshellarg($if) . " mode " . escapeshellarg($standard));
- //fwrite($wlan_setup_log, "/sbin/ifconfig " . escapeshellarg($if) . " mode " . escapeshellarg($standard) . "\n");
+ /* The mode must be specified in a separate command before ifconfig
+ * will allow the mode and channel at the same time in the next.
+ * Only do this for AP mode as this breaks client mode (PR 198680).
+ */
+ if ($wlcfg['mode'] == "hostap") {
+ mwexec("/sbin/ifconfig " . escapeshellarg($if) . " mode " . escapeshellarg($standard));
+ fwrite($wlan_setup_log, "/sbin/ifconfig " . escapeshellarg($if) . " mode " . escapeshellarg($standard) . "\n");
+ }
/* configure wireless */
$wlcmd_args = implode(" ", $wlcmd);
OpenPOWER on IntegriCloud