VLAN: Reorder init to get same behavior for all VLAN interfaces
Both the wildcard VLAN entry and the statically configured VLAN interfaces should behave in the same way. Initializing the full dynamic VLAN code before adding the statically configured VLAN interfaces allows the same processing to be applied to both statically and dynamically added VLAN interface (i.e., also the statically configured ones will be added to a bridge).
This commit is contained in:
parent
0249c988bb
commit
e34ce1683c
1 changed files with 3 additions and 3 deletions
|
@ -800,13 +800,13 @@ static void vlan_dynamic_remove(struct hostapd_data *hapd,
|
||||||
|
|
||||||
int vlan_init(struct hostapd_data *hapd)
|
int vlan_init(struct hostapd_data *hapd)
|
||||||
{
|
{
|
||||||
if (vlan_dynamic_add(hapd, hapd->conf->vlan))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
#ifdef CONFIG_FULL_DYNAMIC_VLAN
|
#ifdef CONFIG_FULL_DYNAMIC_VLAN
|
||||||
hapd->full_dynamic_vlan = full_dynamic_vlan_init(hapd);
|
hapd->full_dynamic_vlan = full_dynamic_vlan_init(hapd);
|
||||||
#endif /* CONFIG_FULL_DYNAMIC_VLAN */
|
#endif /* CONFIG_FULL_DYNAMIC_VLAN */
|
||||||
|
|
||||||
|
if (vlan_dynamic_add(hapd, hapd->conf->vlan))
|
||||||
|
return -1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue