diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-06-29 00:57:25 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-06-29 00:57:25 -0500 |
commit | 4400ad904dd8ed0a95f9a35925af71d72b30893b (patch) | |
tree | d5c5ae5f50c9ce9fa55b81cab40359e92fc7f66b /src | |
parent | 31df78a89d5bc789a68bfdb1dfc5b27dadb36ccf (diff) | |
parent | fcf77526683e710f61c2c62b44365f0adf24989f (diff) | |
download | pfsense-4400ad904dd8ed0a95f9a35925af71d72b30893b.zip pfsense-4400ad904dd8ed0a95f9a35925af71d72b30893b.tar.gz |
Merge pull request #2934 from k-paulius/patch-14
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/interfaces.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 0895a8e..9b99d06 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3510,8 +3510,8 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent = /* always configure a link-local of fe80::1:1 on the track6 interfaces */ $realif = get_real_interface($interface); - $linklocal = find_interface_ipv6_ll($realif); - if (!empty($linklocal)) { + $linklocal = find_interface_ipv6_ll($realif, true); + if (!empty($linklocal) && $linklocal != "fe80::1:1%{$realif}") { mwexec("/sbin/ifconfig {$realif} inet6 {$linklocal} delete"); } /* XXX: This might break for good on a carp installation using link-local as network ips */ |