diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-12-27 21:46:48 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-12-27 21:46:48 +0000 |
| commit | 3789e4df7adf786131557ff55ba62836d503a394 (patch) | |
| tree | 0a8f54d3afb2d6fa307e70bf837a690564c5344a /etc/inc/interfaces.inc | |
| parent | 7695ef3ff969344b158cf6d606450d20ad7ab4a7 (diff) | |
| download | pfsense-3789e4df7adf786131557ff55ba62836d503a394.zip pfsense-3789e4df7adf786131557ff55ba62836d503a394.tar.gz | |
Setup STP correctly when interfaces are not wireles
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 0e007ef..1b089f3 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -136,10 +136,9 @@ function interfaces_lan_configure() { /* assign items to a bridge */ mwexec("/sbin/ifconfig bridge{$bridges_total} addm {$lancfg['if']} addm {$config['interfaces'][$lancfg['bridge']]['if']}"); - if(is_interface_wireless($lancfg['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$lancfg['if']}"); - if(is_interface_wireless($config['interfaces'][$lancfg['bridge']]['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$lancfg['bridge']]['if']}"); + if(is_interface_wireless($lancfg['if']) and + is_interface_wireless($config['interfaces'][$lancfg['bridge']]['if'])) + mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$lancfg['bridge']]['if']} stp {$lancfg['if']}"); /* log commands run for debugging in /tmp/ */ $fd = fopen("{$g['tmp_path']}/bridge_config_{$lancfg['if']}", "w"); @@ -302,10 +301,9 @@ function interfaces_optional_configure_if($opti) { /* assign items to a bridge */ mwexec("/sbin/ifconfig bridge{$bridges_total} addm {$optcfg['if']} addm {$config['interfaces'][$optcfg['bridge']]['if']}"); - if(is_interface_wireless($optcfg['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$optcfg['if']}"); - if(is_interface_wireless($config['interfaces'][$optcfg['bridge']]['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$optcfg['bridge']]['if']}"); + if(is_interface_wireless($optcfg['if']) and + is_interface_wireless($config['interfaces'][$optcfg['bridge']]['if'])) + mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$optcfg['bridge']]['if']} stp {$optcfg['if']}"); /* log commands run for debugging in /tmp/ */ $fd = fopen("{$g['tmp_path']}/bridge_config_{$optcfg['if']}", "w"); @@ -833,10 +831,9 @@ function interfaces_wan_configure() { /* assign items to a bridge */ mwexec("/sbin/ifconfig bridge{$bridges_total} addm {$wancfg['if']} addm {$config['interfaces'][$wancfg['bridge']]['if']}"); - if(is_interface_wireless($wancfg['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$wancfg['if']}"); - if(is_interface_wireless($config['interfaces'][$wancfg['bridge']]['if'])) - mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$wancfg['bridge']]['if']}"); + if(is_interface_wireless($wancfg['if']) and + is_interface_wireless($config['interfaces'][$wancfg['bridge']]['if'])) + mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$config['interfaces'][$wancfg['bridge']]['if']} stp {$wancfg['if']}"); /* log commands run for debugging in /tmp/ */ $fd = fopen("{$g['tmp_path']}/bridge_config_{$wancfg['if']}", "w"); |
