[OpenWrt-Commits] r41826 - in trunk/package/network/utils/iwinfo: . src

[openwrt-commits]

Author: jow
Date: 2014-07-25 16:11:50 +0200 (Fri, 25 Jul 2014)
New Revision: 41826

Modified:
   trunk/package/network/utils/iwinfo/Makefile
   trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c
   trunk/package/network/utils/iwinfo/src/iwinfo_utils.c
Log:
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 <j...@openwrt.org>

Modified: trunk/package/network/utils/iwinfo/Makefile
===================================================================
--- trunk/package/network/utils/iwinfo/Makefile 2014-07-24 22:05:19 UTC (rev 
41825)
+++ trunk/package/network/utils/iwinfo/Makefile 2014-07-25 14:11:50 UTC (rev 
41826)
@@ -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 := \

Modified: trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c
===================================================================
--- trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c     2014-07-24 
22:05:19 UTC (rev 41825)
+++ trunk/package/network/utils/iwinfo/src/iwinfo_nl80211.c     2014-07-25 
14:11:50 UTC (rev 41826)
@@ -2003,8 +2003,7 @@
                        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 */

Modified: trunk/package/network/utils/iwinfo/src/iwinfo_utils.c
===================================================================
--- trunk/package/network/utils/iwinfo/src/iwinfo_utils.c       2014-07-24 
22:05:19 UTC (rev 41825)
+++ trunk/package/network/utils/iwinfo/src/iwinfo_utils.c       2014-07-25 
14:11:50 UTC (rev 41826)
@@ -113,6 +113,7 @@
        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]++;
 
_______________________________________________
openwrt-commits mailing list
openwrt-commits@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits