From e49d908f940be3f957e9fc027ce89cab8a803bd2 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 8 Mar 2016 16:40:16 +0100 Subject: [PATCH] layer2interface: use vlanctl --dhcp-bridged option for vlan ifaces that belong to a managed bridge --- layer2interface/broadcom/lib/network/vlan.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/layer2interface/broadcom/lib/network/vlan.sh b/layer2interface/broadcom/lib/network/vlan.sh index 2ae1f3cde..b2b716090 100755 --- a/layer2interface/broadcom/lib/network/vlan.sh +++ b/layer2interface/broadcom/lib/network/vlan.sh @@ -98,8 +98,12 @@ addbrcmvlan () bridge=0 fi - if [ "$bridge" -eq 1 -a "$unmanaged" == "1" ]; then - vlanctl --if-create $baseifname $vlan8021q + if [ "$bridge" -eq 1 ]; then + if [ "$unmanaged" == "1" ]; then + vlanctl --if-create $baseifname $vlan8021q + else + vlanctl --dhcp-bridged --if-create $baseifname $vlan8021q + fi else vlanctl --routed --if-create $baseifname $vlan8021q fi @@ -169,8 +173,12 @@ brcm_virtual_interface_rules () bridge=0 fi - if [ "$bridge" -eq 1 -a "$unmanaged" == "1" ]; then - vlanctl --if-create-name $baseifname $ifname + if [ "$bridge" -eq 1 ]; then + if [ "$unmanaged" == "1" ]; then + vlanctl --if-create $baseifname $vlan8021q + else + vlanctl --dhcp-bridged --if-create $baseifname $vlan8021q + fi else vlanctl --routed --if-create-name $baseifname $ifname fi