diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-08-05 14:36:10 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-08-05 14:36:10 -0700 |
| commit | d5c075b0c218277d0f926daf1f9eff974b9656dc (patch) | |
| tree | 4c4d38624088790da4e00a3f17271a52beed2cfb /hostapd | |
| parent | c2ebb4b85d69b65f552fee71ac68f44e8d87b39e (diff) | |
| download | android_external_wpa_supplicant_8-d5c075b0c218277d0f926daf1f9eff974b9656dc.tar.gz android_external_wpa_supplicant_8-d5c075b0c218277d0f926daf1f9eff974b9656dc.tar.bz2 android_external_wpa_supplicant_8-d5c075b0c218277d0f926daf1f9eff974b9656dc.zip | |
Cumulative patch from commit c2db79f2376c61c21918162fb2222a66c029fa48
c2db79f VLAN: Remove vlan_tail
f7b4ef2 TDLS: Handle transmission failures of TPK Handshake messages
a2ea8d6 P2P: Fix invalid remain-on-channel duration for frame TX
cbf41ca P2P: Do not delay retries on failure during group formation
dc01de8 nl80211: Fix TDLS key configuration to not set TX key index
Change-Id: Id2418699c3ce49a7e198ab9c0d718ab4a713df62
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'hostapd')
| -rw-r--r-- | hostapd/config_file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c index bf17abec..e9d324f9 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -93,11 +93,8 @@ static int hostapd_config_read_vlan_file(struct hostapd_bss_config *bss, vlan->vlan_id = vlan_id; os_strlcpy(vlan->ifname, pos, sizeof(vlan->ifname)); - if (bss->vlan_tail) - bss->vlan_tail->next = vlan; - else - bss->vlan = vlan; - bss->vlan_tail = vlan; + vlan->next = bss->vlan; + bss->vlan = vlan; } fclose(f); |