diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 10:55:16 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 10:55:16 -0400 |
| commit | 253919a5f8e540211f623e9795f63d14b1ff704d (patch) | |
| tree | fb308942cdad0d1d513bc9d387b251ab5e473ddf /src/usr | |
| parent | 2bd0585e30e5ec8fc3b79ca3f579bf9a7c1bcbc8 (diff) | |
| parent | 1322ee22354f1a6e184819fb7009a2996b63de97 (diff) | |
| download | pfsense-253919a5f8e540211f623e9795f63d14b1ff704d.zip pfsense-253919a5f8e540211f623e9795f63d14b1ff704d.tar.gz | |
Merge pull request #2906 from Chrisc-c-c/Fix-QinQ-Interfaces
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/interfaces_assign.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 68d2d32..73d4839 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -191,13 +191,13 @@ if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) { /* add QinQ interfaces */ if (is_array($config['qinqs']['qinqentry']) && count($config['qinqs']['qinqentry'])) { foreach ($config['qinqs']['qinqentry'] as $qinq) { - $portlist["vlan{$qinq['tag']}"]['descr'] = "VLAN {$qinq['tag']}"; - $portlist["vlan{$qinq['tag']}"]['isqinq'] = true; + $portlist["{$qinq['vlanif']}"]['descr'] = "VLAN {$qinq['tag']} on {$qinq['if']}"; + $portlist["{$qinq['vlanif']}"]['isqinq'] = true; /* QinQ members */ $qinqifs = explode(' ', $qinq['members']); foreach ($qinqifs as $qinqif) { - $portlist["vlan{$qinq['tag']}_{$qinqif}"]['descr'] = "QinQ {$qinqif}"; - $portlist["vlan{$qinq['tag']}_{$qinqif}"]['isqinq'] = true; + $portlist["{$qinq['vlanif']}_{$qinqif}"]['descr'] = "QinQ {$qinqif} on VLAN {$qinq['tag']} on {$qinq['if']}"; + $portlist["{$qinq['vlanif']}_{$qinqif}"]['isqinq'] = true; } } } |
