Merge pull request #3788 from znerol/feature/master/bridge-ipv6-auto-linklocal

1 files changed, 13 insertions, 0 deletions

diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php
index 2db6f54..e589d4c 100644
--- a/src/usr/local/www/interfaces_bridge_edit.php
+++ b/src/usr/local/www/interfaces_bridge_edit.php
@@ -35,6 +35,7 @@ if (!is_array($config['bridges']['bridged'])) {
 function is_aoadv_used($pconfig) {
 	if (($pconfig['static'] !="") ||
 	    ($pconfig['private'] != "") ||
+	    $pconfig['ip6linklocal'] ||
 	    ($pconfig['stp'] != "") ||
 	    ($pconfig['span'] != "") ||
 	    ($pconfig['edge'] != "") ||
@@ -69,6 +70,7 @@ $id = $_REQUEST['id'];
 
 if (isset($id) && $a_bridges[$id]) {
 	$pconfig['enablestp'] = isset($a_bridges[$id]['enablestp']);
+	$pconfig['ip6linklocal'] = isset($a_bridges[$id]['ip6linklocal']);
 	$pconfig['descr'] = $a_bridges[$id]['descr'];
 	$pconfig['bridgeif'] = $a_bridges[$id]['bridgeif'];
 	$pconfig['members'] = $a_bridges[$id]['members'];
@@ -289,6 +291,10 @@ if ($_POST['save']) {
 		$ifpriority = "";
 		$ifpathcost = "";
 
+		if ($_POST['ip6linklocal']) {
+			$bridge['ip6linklocal'] = true;
+		}
+
 		foreach ($ifacelist as $ifn => $ifdescr) {
 			if ($_POST[$ifn] <> "") {
 				if ($i > 0) {
@@ -516,6 +522,13 @@ $section->addInput(new Form_Select(
 	true
 ))->setHelp('Mark an interface as a "private" interface. A private interface does not forward any traffic to any other port that is also a private interface. ');
 
+$section->addInput(new Form_Checkbox(
+	'ip6linklocal',
+	'Enable IPv6 auto linklocal',
+	null,
+	$pconfig['ip6linklocal']
+))->setHelp('When enabled, the AUTO_LINKLOCAL flag is set on the bridge interface and cleared on every member interface. This is required when the bridge interface is used for stateless autoconfiguration. ');
+
 //	STP section
 // ToDo: - Should disable spanning tree section when not checked
 $section->addInput(new Form_Checkbox(