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

Revert "nl80211: Skip interface down/up when setting MAC address"

Browse source 
This reverts commit bffd2b3994.

Revert this commit to fix a regression when setting up P2P Group Owner
on some old device.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Hu Wang 2024-03-26 22:53:34 -07:00 committed by Jouni Malinen
parent 94506e8ed8
commit 9ac0e785c3
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/drivers/driver_nl80211.c
View file

@ -11871,15 +11871,6 @@ static int nl80211_set_mac_addr(void *priv, const u8 *addr)
if (!addr) if (!addr)
addr = drv->perm_addr; addr = drv->perm_addr;
/*
* Try to change the address first without setting the interface
* down and then fall back to DOWN/set addr/UP if the first
* attempt failed. This can reduce the interface setup time
* significantly with some drivers.
*/
if (!linux_set_ifhwaddr(drv->global->ioctl_sock, bss->ifname, addr))
goto done;
if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 0) < 0) if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 0) < 0)
return -1; return -1;
@ -11896,19 +11887,18 @@ static int nl80211_set_mac_addr(void *priv, const u8 *addr)
return -1; return -1;
} }
if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1) < 0)
{
wpa_printf(MSG_DEBUG,
"nl80211: Could not restore interface UP after set_mac_addr");
}
done:
wpa_printf(MSG_DEBUG, "nl80211: set_mac_addr for %s to " MACSTR, wpa_printf(MSG_DEBUG, "nl80211: set_mac_addr for %s to " MACSTR,
bss->ifname, MAC2STR(addr)); bss->ifname, MAC2STR(addr));
drv->addr_changed = new_addr; drv->addr_changed = new_addr;
os_memcpy(bss->prev_addr, bss->addr, ETH_ALEN); os_memcpy(bss->prev_addr, bss->addr, ETH_ALEN);
os_memcpy(bss->addr, addr, ETH_ALEN); os_memcpy(bss->addr, addr, ETH_ALEN);
if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1) < 0)
{
wpa_printf(MSG_DEBUG,
"nl80211: Could not restore interface UP after set_mac_addr");
}
return 0; return 0;
} }