From 833820dc8bd380d4bb6812c663cae58c7a24aecd Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 25 Jul 2014 14:11:50 +0000 Subject: [PATCH] iwinfo: continue scanning even if temporary mac cannot be changed So far iwinfo aborted a wifi scan attempt if the mac of the spawned interface could not be changed. Change the code to try anyway - this should fix wifi scanning on RaLink devices. Signed-off-by: Jo-Philipp Wich SVN-Revision: 41826 --- package/network/utils/iwinfo/Makefile | 2 +- package/network/utils/iwinfo/src/iwinfo_nl80211.c | 3 +-- package/network/utils/iwinfo/src/iwinfo_utils.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 9efb9c974c39..e4ee73a11246 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiwinfo -PKG_RELEASE:=49 +PKG_RELEASE:=50 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CONFIG_DEPENDS := \ diff --git a/package/network/utils/iwinfo/src/iwinfo_nl80211.c b/package/network/utils/iwinfo/src/iwinfo_nl80211.c index 4a52d5ca8dfa..c8b167b32ab0 100644 --- a/package/network/utils/iwinfo/src/iwinfo_nl80211.c +++ b/package/network/utils/iwinfo/src/iwinfo_nl80211.c @@ -2003,8 +2003,7 @@ static int nl80211_get_scanlist(const char *ifname, char *buf, int *len) if (!(res = nl80211_ifadd(ifname))) goto out; - if (!iwinfo_ifmac(res)) - goto out; + iwinfo_ifmac(res); /* if we can take the new interface up, the driver supports an * additional interface and there's no need to tear down the ap */ diff --git a/package/network/utils/iwinfo/src/iwinfo_utils.c b/package/network/utils/iwinfo/src/iwinfo_utils.c index dd49303f8aa3..1702ce88f6d1 100644 --- a/package/network/utils/iwinfo/src/iwinfo_utils.c +++ b/package/network/utils/iwinfo/src/iwinfo_utils.c @@ -113,6 +113,7 @@ int iwinfo_ifmac(const char *ifname) if (iwinfo_ioctl(SIOCGIFHWADDR, &ifr)) return 0; + ifr.ifr_hwaddr.sa_data[0] |= 0x02; ifr.ifr_hwaddr.sa_data[1]++; ifr.ifr_hwaddr.sa_data[2]++; -- 2.30.2