summaryrefslogtreecommitdiffstats
path: root/etc/inc/interfaces.inc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2014-11-25 19:32:02 +0100
committerErmal LUÇI <eri@pfsense.org>2014-11-25 19:32:02 +0100
commitba8e4c8832f5d4e834c01acb7eecfeb430ae8033 (patch)
tree29bdaa8c92b57538dd3efc65977138a5c4388273 /etc/inc/interfaces.inc
parentbc8f326432934814dec718e2a38753530380ec66 (diff)
downloadpfsense-ba8e4c8832f5d4e834c01acb7eecfeb430ae8033.zip
pfsense-ba8e4c8832f5d4e834c01acb7eecfeb430ae8033.tar.gz
Remove the mac address propagation to vlans since FreeBSD 10 handles this itself
Diffstat (limited to 'etc/inc/interfaces.inc')
-rw-r--r--etc/inc/interfaces.inc14
1 files changed, 1 insertions, 13 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 373cc09..4aed982 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2919,18 +2919,6 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
if ($wancfg['spoofmac'] && ($wancfg['spoofmac'] != $mac)) {
mwexec("/sbin/ifconfig " . escapeshellarg($realhwif) .
" link " . escapeshellarg($wancfg['spoofmac']));
-
- /*
- * All vlans need to spoof their parent mac address, too. see
- * ticket #1514: http://cvstrac.pfsense.com/tktview?tn=1514,33
- */
- if (is_array($config['vlans']['vlan'])) {
- foreach ($config['vlans']['vlan'] as $vlan) {
- if ($vlan['if'] == $realhwif)
- mwexec("/sbin/ifconfig " . escapeshellarg($vlan['vlanif']) .
- " link " . escapeshellarg($wancfg['spoofmac']));
- }
- }
} else {
if ($mac == "ff:ff:ff:ff:ff:ff") {
@@ -2960,7 +2948,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
/* Apply hw offloading policies as configured */
enable_hardware_offloading($interface);
- /* invalidate interface/ip/sn cache */
+ /* invaldate interface/ip/sn cache */
get_interface_arr(true);
unset($interface_ip_arr_cache[$realif]);
unset($interface_sn_arr_cache[$realif]);
OpenPOWER on IntegriCloud