mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove return value of interface_bridge_configure

Browse Source
This commit is contained in:
bcyrill 2013-01-26 23:58:04 +01:00
parent 6d53bbb506
commit 0e0002c2cb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/interfaces.inc
View File

@ -442,16 +442,16 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) {
global $config, $g;
if (!is_array($bridge))
return -1;
return;
if (empty($bridge['members'])) {
log_error(sprintf(gettext("No members found on %s"), $bridge['bridgeif']));
return -1;
return;
}
$members = explode(',', $bridge['members']);
if (!count($members))
return -1;
return;
/* Calculate smaller mtu and enforce it */
$smallermtu = 0;
@ -634,8 +634,6 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) {
interfaces_bring_up($bridge['bridgeif']);
else
log_error(gettext("bridgeif not defined -- could not bring interface up"));
return $bridge['bridgeif'];
}
function interface_bridge_add_member($bridgeif, $interface) {

2
usr/local/www/interfaces_bridge_edit.php
View File

@ -212,7 +212,7 @@ if ($_POST) {
$bridge['autoptp'] = implode(',', $_POST['autoptp']);
$bridge['bridgeif'] = $_POST['bridgeif'];
$bridge['bridgeif'] = interface_bridge_configure($bridge);
interface_bridge_configure($bridge);
if ($bridge['bridgeif'] == "" || !stristr($bridge['bridgeif'], "bridge"))
$input_errors[] = gettext("Error occured creating interface, please retry.");
else {