mirror of
https://git.proxmox.com/git/ifupdown2
synced 2025-07-26 17:05:52 +00:00
214bc505ac
remove add-uplink-id-option.patch (not needed), remove arp-accept option patch (available upstream) remove debian-fixup-networking.service.patch (new @ifup service upstream) rebase others patches Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 8187e6e4a8cea198d86c4df8117335b7b93047d0 Mon Sep 17 00:00:00 2001
|
|
From: Alexandre Derumier <aderumier@odiso.com>
|
|
Date: Mon, 1 Apr 2019 09:17:11 +0200
|
|
Subject: [PATCH 4/7] allow vlan subinterface in a vlan-aware bridge
|
|
|
|
for stacked/qinq vlan, it's perfectly fine to have a vlan-aware bridge with a tagged interface port
|
|
|
|
fix:
|
|
https://github.com/CumulusNetworks/ifupdown2/issues/92
|
|
|
|
sample config:
|
|
|
|
auto eth0.2
|
|
iface eth0.2 inet manual
|
|
|
|
auto bridge
|
|
iface bridge inet manual
|
|
bridge-ports eth0.2
|
|
bridge-stp off
|
|
bridge-fd 0
|
|
bridge-vlan-aware yes
|
|
|
|
bridge 8000.c81f66f8688c no eth0.2
|
|
|
|
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
ifupdown2/addons/bridge.py | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
|
|
index 35944ac..f353d6c 100644
|
|
--- a/ifupdown2/addons/bridge.py
|
|
+++ b/ifupdown2/addons/bridge.py
|
|
@@ -890,11 +890,6 @@ class bridge(Addon, moduleBase):
|
|
result = True
|
|
for port_name in ports:
|
|
port_obj_l = ifaceobj_getfunc(port_name)
|
|
- if port_obj_l and port_obj_l[0].link_kind & ifaceLinkKind.VLAN:
|
|
- self.logger.error('%s: %s: vlan sub-interface is not '
|
|
- 'supported in a vlan-aware bridge'
|
|
- % (ifaceobj.name, port_name))
|
|
- result = False
|
|
if (port_obj_l and
|
|
port_obj_l[0].get_attr_value('bridge-arp-nd-suppress') and
|
|
self.arp_nd_suppress_only_on_vxlan and
|
|
--
|
|
2.20.1
|
|
|