Index: hostapd-20111103/src/ap/vlan_init.c
===================================================================
--- hostapd-20111103.orig/src/ap/vlan_init.c 2011-12-04 14:52:34.927944410 -0800
+++ hostapd-20111103/src/ap/vlan_init.c 2011-12-04 14:56:13.895944447 -0800
@@ -403,8 +403,8 @@
/* Determine if a suitable vlan device already exists. */
- os_snprintf(if_request.device1, sizeof(if_request.device1), "vlan%d",
- vid);
+ os_snprintf(if_request.device1, sizeof(if_request.device1), "%s.%d",
+ if_name, vid);
if_request.cmd = _GET_VLAN_VID_CMD;
@@ -487,7 +487,7 @@
while (vlan) {
if (os_strcmp(ifname, vlan->ifname) == 0) {
- os_snprintf(br_name, sizeof(br_name), "brvlan%d",
+ os_snprintf(br_name, sizeof(br_name), "br-vlan%d",
vlan->vlan_id);
if (!br_addbr(br_name))
@@ -501,7 +501,7 @@
vlan->clean |= DVLAN_CLEAN_VLAN;
os_snprintf(vlan_ifname, sizeof(vlan_ifname),
- "vlan%d", vlan->vlan_id);
+ "%s.%d", tagged_interface, vlan->vlan_id);
if (!br_addif(br_name, vlan_ifname))
vlan->clean |= DVLAN_CLEAN_VLAN_PORT;
@@ -534,7 +534,7 @@
while (vlan) {
if (os_strcmp(ifname, vlan->ifname) == 0) {
- os_snprintf(br_name, sizeof(br_name), "brvlan%d",
+ os_snprintf(br_name, sizeof(br_name), "br-vlan%d",
vlan->vlan_id);
if (vlan->clean & DVLAN_CLEAN_WLAN_PORT)
@@ -542,7 +542,7 @@
if (tagged_interface) {
os_snprintf(vlan_ifname, sizeof(vlan_ifname),
- "vlan%d", vlan->vlan_id);
+ "%s.%d", tagged_interface, vlan->vlan_id);
if (vlan->clean & DVLAN_CLEAN_VLAN_PORT)
br_delif(br_name, vlan_ifname);
ifconfig_down(vlan_ifname);
@@ -682,7 +682,7 @@
if (priv == NULL)
return NULL;
- vlan_set_name_type(VLAN_NAME_TYPE_PLUS_VID_NO_PAD);
+ vlan_set_name_type(VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD);
priv->s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (priv->s < 0) {