DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use sta->vlan_id when needed for VLAN offload

Browse source 
Share VLAN info in RRB when the driver advertises support for VLAN
offload (WPA_DRIVER_FLAGS_VLAN_OFFLOAD). sta->vlan_desc is unused in
this case, only sta->vlan_id is used. Skip the checks that are based on
sta->vlan_desc.

Signed-off-by: Sai Pratyusha Magam <quic_smagam@quicinc.com>
This commit is contained in:
Sai Pratyusha Magam 2023-12-18 09:48:23 +05:30 committed by Jouni Malinen
parent fc4532d0d3
commit 618df655ae
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/ap/wpa_auth_glue.c
View file

@ -1155,17 +1155,25 @@ static int hostapd_wpa_auth_set_vlan(void *ctx, const u8 *sta_addr,
if (!sta || !sta->wpa_sm)
return -1;
if (vlan->notempty &&
!hostapd_vlan_valid(hapd->conf->vlan, vlan)) {
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO,
"Invalid VLAN %d%s received from FT",
vlan->untagged, vlan->tagged[0] ? "+" : "");
return -1;
}
if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_VLAN_OFFLOAD)) {
if (vlan->notempty &&
!hostapd_vlan_valid(hapd->conf->vlan, vlan)) {
hostapd_logger(hapd, sta->addr,
HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO,
"Invalid VLAN %d%s received from FT",
vlan->untagged, vlan->tagged[0] ?
"+" : "");
return -1;
}
if (ap_sta_set_vlan(hapd, sta, vlan) < 0)
return -1;
if (ap_sta_set_vlan(hapd, sta, vlan) < 0)
return -1;
} else {
if (vlan->notempty)
sta->vlan_id = vlan->untagged;
}
/* Configure wpa_group for GTK but ignore error due to driver not
* knowing this STA. */
ap_sta_bind_vlan(hapd, sta);
@ -1188,10 +1196,15 @@ static int hostapd_wpa_auth_get_vlan(void *ctx, const u8 *sta_addr,
if (!sta)
return -1;
if (sta->vlan_desc)
if (sta->vlan_desc) {
*vlan = *sta->vlan_desc;
else
} else if ((hapd->iface->drv_flags & WPA_DRIVER_FLAGS_VLAN_OFFLOAD) &&
sta->vlan_id) {
vlan->notempty = 1;
vlan->untagged = sta->vlan_id;
} else {
os_memset(vlan, 0, sizeof(*vlan));
}
return 0;
}