diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-02-27 23:08:43 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-02-27 23:08:43 +0000 |
| commit | 12fea2f7a4cbcd16077b84f852b05ca2659db68c (patch) | |
| tree | 4331a9b5194d6b39158468ee2385e68a2eccac60 | |
| parent | cf8f9e74bccadb2dea0b6a7dae286d91eb59b151 (diff) | |
| download | pfsense-12fea2f7a4cbcd16077b84f852b05ca2659db68c.zip pfsense-12fea2f7a4cbcd16077b84f852b05ca2659db68c.tar.gz | |
Do not write out STP to debugging .sh file if either interface is wireless, it confuses what we did previously.
| -rw-r--r-- | etc/inc/interfaces.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 6aec508..142e27e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -154,7 +154,9 @@ function interfaces_lan_configure() { fwrite($fd, "/sbin/ifconfig {$config['interfaces'][$lancfg['bridge']]['if']} mtu {$mtu}\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} create\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} addm {$lancfg['if']} addm {$config['interfaces'][$lancfg['bridge']]['if']}\n"); - fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$lancfg['if']} stp {$config['interfaces'][$lancfg['bridge']]['if']}\n"); + if(!is_interface_wireless($lancfg['if']) and + !is_interface_wireless($config['interfaces'][$lancfg['bridge']]['if'])) + fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$lancfg['if']} stp {$config['interfaces'][$lancfg['bridge']]['if']}\n"); fclose($fd); /* bring up interfaces */ @@ -320,7 +322,9 @@ function interfaces_optional_configure_if($opti) { fwrite($fd, "/sbin/ifconfig {$config['interfaces'][$optcfg['bridge']]['if']} mtu {$mtu}\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} create\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} addm {$optcfg['if']} addm {$config['interfaces'][$optcfg['bridge']]['if']} up\n"); - fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$optcfg['if']} stp {$config['interfaces'][$optcfg['bridge']]['if']}\n"); + if(!is_interface_wireless($optcfg['if']) and + !is_interface_wireless($config['interfaces'][$optcfg['bridge']]['if'])) + fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$optcfg['if']} stp {$config['interfaces'][$optcfg['bridge']]['if']}\n"); fclose($fd); /* bring up interfaces */ @@ -894,7 +898,9 @@ function interfaces_wan_configure() { fwrite($fd, "/sbin/ifconfig {$config['interfaces'][$wancfg['bridge']]['if']} mtu {$mtu}\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} create\n"); fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} addm {$wancfg['if']} addm {$config['interfaces'][$wancfg['bridge']]['if']}\n"); - fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$wancfg['if']} stp {$config['interfaces'][$wancfg['bridge']]['if']}\n"); + if(!is_interface_wireless($wancfg['if']) and + !is_interface_wireless($config['interfaces'][$wancfg['bridge']]['if'])) + fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$wancfg['if']} stp {$config['interfaces'][$wancfg['bridge']]['if']}\n"); fclose($fd); /* bring up interfaces */ |
