summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2009-04-06 18:58:09 -0400
committerChris Buechler <cmb@pfsense.org>2009-04-06 18:58:09 -0400
commit8e31e04990667f5861902fa879746ad165523efb (patch)
tree790932cafa5daf7ff3dd95cd0b520cd73e318eff /etc
parent126a0b09ec0e1d88416a7a3cec4e2e6989f072d3 (diff)
parent58936a34d951699b450db2b9d354c17d2b7dff85 (diff)
downloadpfsense-8e31e04990667f5861902fa879746ad165523efb.zip
pfsense-8e31e04990667f5861902fa879746ad165523efb.tar.gz
Merge branch 'master' of git@rcs.pfsense.org:pfsense/mainline
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 28238e9..88d9f72 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3,7 +3,7 @@
/*
interfaces.inc
Copyright (C) 2004-2008 Scott Ullrich
- Copyright (C) 2008 Ermal Luçi
+ Copyright (C) 2008-2009 Ermal Luçi
All rights reserved.
function interfaces_wireless_configure is
@@ -249,7 +249,6 @@ function interface_qinq2_configure($qinq, $fd, $macaddr) {
if (!is_array($qinq)) {
log_error("QinQ compat VLAN: called with wrong options. Problems with config!\n");
- echo "ERROR";
return;
}
OpenPOWER on IntegriCloud