diff options
| author | Chris Buechler <cmb@pfsense.org> | 2009-01-25 04:17:42 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2009-01-25 04:17:42 -0500 |
| commit | 27880ee76b406d39155f9a8c78eb5775f99ad735 (patch) | |
| tree | 5c565bdc3646ba98007f55d58b7ee33dfc1dd5d0 /etc | |
| parent | 5a19af1760e32c5c6943596713d129e06f4e30af (diff) | |
| download | pfsense-27880ee76b406d39155f9a8c78eb5775f99ad735.zip pfsense-27880ee76b406d39155f9a8c78eb5775f99ad735.tar.gz | |
don't enable STP on VLANs
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 152bb8c..9d3dbab 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1626,18 +1626,24 @@ function setup_bridge() { $bridgecmd = "/sbin/ifconfig bridge{$x} "; $lowestmtu = "1500"; $wirelessbridge = false; - // iterate through and see if any of the involved interfaces are wireless + $vlanbridge = false; + // iterate through and see if any of the involved interfaces are wireless or VLANs foreach ($bridgearray[$x] as $bridgeif) { $friendlyifname = convert_real_interface_to_friendly_interface_name($bridgeif); if(is_interface_wireless($friendlyifname)) $wirelessbridge = true; + if(substr($bridgeif,0,4) == "vlan") + $vlanbridge = true; } + foreach ($bridgearray[$x] as $bridgeif) { // iterate through all the interfaces in this bridge // append to the bridgecmd for this interface // only use STP if no wireless interfaces are involved if($wirelessbridge) $bridgecmd .= " addm $bridgeif "; + elseif (substr($bridgeif,0,4) == "vlan") + $bridgecmd .= " addm $bridgeif "; else $bridgecmd .= " addm $bridgeif stp $bridgeif "; // get MTU for this interface |
