libs: remove obsolete iwinfo, its independant now

18 files changed, 0 insertions, 5055 deletions

diff --git a/libs/iwinfo/Makefile b/libs/iwinfo/Makefile
deleted file mode 100644
index f9ce36abf4..0000000000
--- a/libs/iwinfo/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
-IWINFO_LDFLAGS    =
-IWINFO_CFLAGS     = -fstrict-aliasing $(if $(CRAP),-DUSE_WL,-DUSE_MADWIFI)
-IWINFO_SO         = iwinfo.so
-IWINFO_LUA        = iwinfo.lua
-IWINFO_OBJ        = $(if $(CRAP),src/iwinfo_wl.o,src/iwinfo_madwifi.o) \
-	src/iwinfo_wext.o src/iwinfo_wext_scan.o src/iwinfo_lualib.o
-
-%.o: %.c
-	$(COMPILE) $(IWINFO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
-
-ifeq ($(SDK),)
-compile: clean $(IWINFO_OBJ)
-	$(LINK) $(SHLIB_FLAGS) $(IWINFO_LDFLAGS) -o src/$(IWINFO_SO) $(IWINFO_OBJ)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/$(IWINFO_SO) dist$(LUA_LIBRARYDIR)/$(IWINFO_SO)
-else
-compile: clean
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/dummy.lua dist$(LUA_LIBRARYDIR)/$(IWINFO_LUA)
-endif
-
-install: build
-	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
-
-clean:
-	rm -f src/*.o src/$(IWINFO_SO)
-
-host-compile:
diff --git a/libs/iwinfo/src/COPYING b/libs/iwinfo/src/COPYING
deleted file mode 100644
index d511905c16..0000000000
--- a/libs/iwinfo/src/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/libs/iwinfo/src/dummy.lua b/libs/iwinfo/src/dummy.lua
deleted file mode 100644
index b2a3c1aa72..0000000000
--- a/libs/iwinfo/src/dummy.lua
+++ /dev/null
@@ -1,114 +0,0 @@
-module "iwinfo"
-
-function type(x)
-	if x:match("^wlan%d") or x:match("^wl%d") or
-	   x:match("^wifi%d") or x:match("^ath%d") then
-		return "dummy"
-	end
-end
-
-dummy = {}
-
-function dummy.channel()
-	return 1
-end
-
-function dummy.frequency()
-	return 2412
-end
-
-function dummy.bitrate()
-	return 36000
-end
-
-function dummy.signal()
-	return -53
-end
-
-function dummy.noise()
-	return -96
-end
-
-function dummy.quality()
-	return 50
-end
-
-function dummy.quality_max()
-	return 70
-end
-
-function dummy.mode()
-	return "Master"
-end
-
-function dummy.ssid()
-	return "OpenWrt"
-end
-
-function dummy.bssid()
-	return "00:11:22:33:44:55"
-end
-
-function dummy.enctype()
-	return "WPA2 PSK (CCMP)"
-end
-
-function dummy.assoclist()
-	return {}
-end
-
-function dummy.txpwrlist()
-	return {
-		{ dbm = 0, mw = 1 },
-		{ dbm = 6, mw = 3 },
-		{ dbm = 8, mw = 6 },
-		{ dbm = 10, mw = 10 },
-		{ dbm = 12, mw = 15 },
-		{ dbm = 14, mw = 25 },
-		{ dbm = 16, mw = 39 },
-		{ dbm = 18, mw = 63 }
-	}
-end
-
-function dummy.freqlist()
-	return {
-		{channel =  1, mhz = 2412},
-		{channel =  2, mhz = 2417},
-		{channel =  3, mhz = 2422},
-		{channel =  4, mhz = 2427},
-		{channel =  5, mhz = 2432},
-		{channel =  6, mhz = 2437},
-		{channel =  7, mhz = 2442},
-		{channel =  8, mhz = 2447},
-		{channel =  9, mhz = 2452},
-		{channel = 10, mhz = 2457},
-		{channel = 11, mhz = 2462}
-	}
-end
-
-function dummy.scanlist()
-	return {
-		{ quality = 23, quality_max = 70, signal = -60,
-		  bssid = "00:12:23:34:45:56", ssid = "Test_Net_1",
-		  channel = 1, mode = "Master", wep = true },
-		{ quality = 45, quality_max = 70, signal = -43,
-		  bssid = "01:23:34:45:56:67", ssid = "Test_Net_2",
-		  channel = 10, mode = "Master", wep = false, wpa = 3,
-		  pair_ciphers = { "TKIP", "CCMP" },
-		  group_ciphers = { "TKIP", "CCMP" },
-		  auth_suites = { "PSK" } },
-		{ quality = 5, quality_max = 70, signal = -77,
-		  bssid = "02:34:45:56:67:78", ssid = "Test_Net_3",
-		  channel = 3, mode = "Master", wep = false, wpa = 1,
-		  pair_ciphers = { "TKIP" },
-		  group_ciphers = { "TKIP" },
-		  auth_suites = { "PSK" } },
-		{ quality = 12, quality_max = 70, signal = -64,
-		  bssid = "02:00:DE:AD:BE:EF", ssid = "Test_Net_4",
-		  channel = 5, mode = "Ad-Hoc", wep = false }
-	}
-end
-
-function dummy.mbssid_support()
-	return 1
-end
diff --git a/libs/iwinfo/src/include/broadcom.h b/libs/iwinfo/src/include/broadcom.h
deleted file mode 100644
index ae7ae531dc..0000000000
--- a/libs/iwinfo/src/include/broadcom.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Custom OID/ioctl definitions for
- * Broadcom 802.11abg Networking Device Driver
- *
- * Definitions subject to change without notice.
- *
- * Copyright 2006, Broadcom Corporation
- * All Rights Reserved.
- * 
- * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY
- * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM
- * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.
- *
- */
-
-#ifndef _BROADCOM_H
-#define _BROADCOM_H
-
-#define WL_MCSSET_LEN				16
-#define WL_MAX_STA_COUNT			32
-
-#define WL_BSS_RSSI_OFFSET			82
-#define WL_BSS_NOISE_OFFSET			84
-
-#define WLC_IOCTL_MAGIC				0x14e46c77
-#define	WLC_IOCTL_MAXLEN			8192
-
-#define WLC_GET_MAGIC				0
-#define WLC_GET_RATE				12
-#define WLC_GET_INFRA				19
-#define WLC_GET_BSSID				23
-#define WLC_GET_SSID				25
-#define WLC_GET_CHANNEL				29
-#define WLC_GET_PASSIVE 			48
-#define WLC_GET_REVINFO				98
-#define WLC_GET_AP					117
-#define WLC_GET_RSSI				127
-#define WLC_GET_WSEC				133
-#define WLC_GET_PHY_NOISE			135
-#define WLC_GET_BSS_INFO			136
-#define WLC_GET_ASSOCLIST			159
-#define WLC_GET_WPA_AUTH			164
-#define WLC_GET_VAR					262
-
-
-struct wl_ether_addr {
-	uint8_t					octet[6];
-};
-
-struct wl_maclist {
-	uint					count;
-	struct wl_ether_addr 	ea[1];
-};
-
-typedef struct wl_sta_rssi {
-	int						rssi;
-	char					mac[6];
-	uint16_t				foo;
-} wl_sta_rssi_t;
-
-typedef struct wlc_ssid {
-	uint32_t				ssid_len;
-	unsigned char			ssid[32];
-} wlc_ssid_t;
-
-/* Linux network driver ioctl encoding */
-typedef struct wl_ioctl {
-	uint32_t				cmd;	/* common ioctl definition */
-	void					*buf;	/* pointer to user buffer */
-	uint32_t				len;	/* length of user buffer */
-	uint8_t					set;	/* get or set request (optional) */
-	uint32_t				used;	/* bytes read or written (optional) */
-	uint32_t				needed;	/* bytes needed (optional) */
-} wl_ioctl_t;
-
-/* Revision info */
-typedef struct wlc_rev_info {
-	uint		vendorid;	/* PCI vendor id */
-	uint		deviceid;	/* device id of chip */
-	uint		radiorev;	/* radio revision */
-	uint		chiprev;	/* chip revision */
-	uint		corerev;	/* core revision */
-	uint		boardid;	/* board identifier (usu. PCI sub-device id) */
-	uint		boardvendor;	/* board vendor (usu. PCI sub-vendor id) */
-	uint		boardrev;	/* board revision */
-	uint		driverrev;	/* driver version */
-	uint		ucoderev;	/* microcode version */
-	uint		bus;		/* bus type */
-	uint		chipnum;	/* chip number */
-} wlc_rev_info_t;
-
-#endif
diff --git a/libs/iwinfo/src/include/madwifi.h b/libs/iwinfo/src/include/madwifi.h
deleted file mode 100644
index fd19dbf613..0000000000
--- a/libs/iwinfo/src/include/madwifi.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Header bits derived from MadWifi source:
- *   Copyright (c) 2001 Atsushi Onoe
- *   Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
- *   All rights reserved.
- *
- * Distributed under the terms of the GPLv2 license.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _MADWIFI_H
-#define _MADWIFI_H
-
-/* ieee80211.h */
-#define	IEEE80211_ADDR_LEN		6
-#define	IEEE80211_RATE_VAL		0x7f
-
-
-/* ieee80211_crypto.h */
-#define	IEEE80211_KEYBUF_SIZE		16
-#define	IEEE80211_MICBUF_SIZE		16
-#define IEEE80211_TID_SIZE			17
-
-#define	IEEE80211_CIPHER_WEP		0
-#define	IEEE80211_CIPHER_TKIP		1
-#define	IEEE80211_CIPHER_AES_OCB	2
-#define	IEEE80211_CIPHER_AES_CCM	3
-#define	IEEE80211_CIPHER_CKIP		5
-#define	IEEE80211_CIPHER_NONE		6
-#define	IEEE80211_CIPHER_MAX		(IEEE80211_CIPHER_NONE + 1)
-
-
-/* ieee80211_ioctl.h */
-#define	IEEE80211_KEY_DEFAULT		0x80
-#define	IEEE80211_CHAN_MAX			255
-#define	IEEE80211_CHAN_BYTES		32
-#define	IEEE80211_RATE_MAXSIZE		15
-
-#define	IEEE80211_IOCTL_GETKEY		(SIOCDEVPRIVATE+3)
-#define	IEEE80211_IOCTL_STA_STATS	(SIOCDEVPRIVATE+5)
-#define	IEEE80211_IOCTL_STA_INFO	(SIOCDEVPRIVATE+6)
-
-#define	IEEE80211_IOCTL_GETPARAM	(SIOCIWFIRSTPRIV+1)
-#define	IEEE80211_IOCTL_GETMODE		(SIOCIWFIRSTPRIV+3)
-#define	IEEE80211_IOCTL_GETCHANLIST	(SIOCIWFIRSTPRIV+7)
-#define	IEEE80211_IOCTL_GETCHANINFO	(SIOCIWFIRSTPRIV+13)
-
-enum {
-	IEEE80211_PARAM_AUTHMODE		= 3,	/* authentication mode */
-	IEEE80211_PARAM_MCASTCIPHER		= 5,	/* multicast/default cipher */
-	IEEE80211_PARAM_UCASTCIPHERS	= 7,	/* unicast cipher suites */
-	IEEE80211_PARAM_WPA				= 10,	/* WPA mode (0,1,2) */
-};
-
-struct ieee80211_channel {
-	u_int16_t ic_freq;	/* setting in MHz */
-	u_int16_t ic_flags;	/* see below */
-	u_int8_t ic_ieee;	/* IEEE channel number */
-	int8_t ic_maxregpower;	/* maximum regulatory tx power in dBm */
-	int8_t ic_maxpower;	/* maximum tx power in dBm */
-	int8_t ic_minpower;	/* minimum tx power in dBm */
-	u_int8_t ic_scanflags;
-	u_int8_t ic_idletime; /* phy idle time in % */
-};
-
-struct ieee80211req_key {
-	u_int8_t ik_type;		/* key/cipher type */
-	u_int8_t ik_pad;
-	u_int16_t ik_keyix;	/* key index */
-	u_int8_t ik_keylen;		/* key length in bytes */
-	u_int8_t ik_flags;
-	u_int8_t ik_macaddr[IEEE80211_ADDR_LEN];
-	u_int64_t ik_keyrsc;		/* key receive sequence counter */
-	u_int64_t ik_keytsc;		/* key transmit sequence counter */
-	u_int8_t ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-};
-
-struct ieee80211req_chanlist {
-	u_int8_t ic_channels[IEEE80211_CHAN_BYTES];
-};
-
-struct ieee80211req_chaninfo {
-	u_int ic_nchans;
-	struct ieee80211_channel ic_chans[IEEE80211_CHAN_MAX];
-};
-
-struct ieee80211req_sta_info {
-	u_int16_t isi_len;		/* length (mult of 4) */
-	u_int16_t isi_freq;		/* MHz */
-	u_int16_t isi_flags;		/* channel flags */
-	u_int16_t isi_state;		/* state flags */
-	u_int8_t isi_authmode;		/* authentication algorithm */
-	u_int8_t isi_rssi;
-	int8_t isi_noise;
-	u_int16_t isi_capinfo;		/* capabilities */
-	u_int8_t isi_athflags;		/* Atheros capabilities */
-	u_int8_t isi_erp;		/* ERP element */
-	u_int8_t isi_macaddr[IEEE80211_ADDR_LEN];
-	u_int8_t isi_nrates;		/* negotiated rates */
-	u_int8_t isi_rates[IEEE80211_RATE_MAXSIZE];
-	u_int8_t isi_txrate;		/* index to isi_rates[] */
-	u_int16_t isi_ie_len;		/* IE length */
-	u_int16_t isi_associd;		/* assoc response */
-	u_int16_t isi_txpower;		/* current tx power */
-	u_int16_t isi_vlan;		/* vlan tag */
-	u_int16_t isi_txseqs[17];	/* seq to be transmitted */
-	u_int16_t isi_rxseqs[17];	/* seq previous for qos frames*/
-	u_int16_t isi_inact;		/* inactivity timer */
-	u_int8_t isi_uapsd;		/* UAPSD queues */
-	u_int8_t isi_opmode;		/* sta operating mode */
-};
-
-#endif
diff --git a/libs/iwinfo/src/include/wext.h b/libs/iwinfo/src/include/wext.h
deleted file mode 100644
index 6b5838e1b8..0000000000
--- a/libs/iwinfo/src/include/wext.h
+++ /dev/null
@@ -1,1139 +0,0 @@
-/*
- * This file define a set of standard wireless extensions
- *
- * Version :	22	16.3.07
- *
- * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
- * Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
- */
-
-#ifndef _LINUX_WIRELESS_H
-#define _LINUX_WIRELESS_H
-
-/************************** DOCUMENTATION **************************/
-/*
- * Initial APIs (1996 -> onward) :
- * -----------------------------
- * Basically, the wireless extensions are for now a set of standard ioctl
- * call + /proc/net/wireless
- *
- * The entry /proc/net/wireless give statistics and information on the
- * driver.
- * This is better than having each driver having its entry because
- * its centralised and we may remove the driver module safely.
- *
- * Ioctl are used to configure the driver and issue commands.  This is
- * better than command line options of insmod because we may want to
- * change dynamically (while the driver is running) some parameters.
- *
- * The ioctl mechanimsm are copied from standard devices ioctl.
- * We have the list of command plus a structure descibing the
- * data exchanged...
- * Note that to add these ioctl, I was obliged to modify :
- *	# net/core/dev.c (two place + add include)
- *	# net/ipv4/af_inet.c (one place + add include)
- *
- * /proc/net/wireless is a copy of /proc/net/dev.
- * We have a structure for data passed from the driver to /proc/net/wireless
- * Too add this, I've modified :
- *	# net/core/dev.c (two other places)
- *	# include/linux/netdevice.h (one place)
- *	# include/linux/proc_fs.h (one place)
- *
- * New driver API (2002 -> onward) :
- * -------------------------------
- * This file is only concerned with the user space API and common definitions.
- * The new driver API is defined and documented in :
- *	# include/net/iw_handler.h
- *
- * Note as well that /proc/net/wireless implementation has now moved in :
- *	# net/core/wireless.c
- *
- * Wireless Events (2002 -> onward) :
- * --------------------------------
- * Events are defined at the end of this file, and implemented in :
- *	# net/core/wireless.c
- *
- * Other comments :
- * --------------
- * Do not add here things that are redundant with other mechanisms
- * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
- * wireless specific.
- *
- * These wireless extensions are not magic : each driver has to provide
- * support for them...
- *
- * IMPORTANT NOTE : As everything in the kernel, this is very much a
- * work in progress. Contact me if you have ideas of improvements...
- */
-
-/***************************** INCLUDES *****************************/
-
-/* This header is used in user-space, therefore need to be sanitised
- * for that purpose. Those includes are usually not compatible with glibc.
- * To know which includes to use in user-space, check iwlib.h. */
-#ifdef __KERNEL__
-#include <linux/types.h>		/* for "caddr_t" et al		*/
-#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <linux/if.h>			/* for IFNAMSIZ and co... */
-#endif	/* __KERNEL__ */
-
-/***************************** VERSION *****************************/
-/*
- * This constant is used to know the availability of the wireless
- * extensions and to know which version of wireless extensions it is
- * (there is some stuff that will be added in the future...)
- * I just plan to increment with each new version.
- */
-#define WIRELESS_EXT	22
-
-/*
- * Changes :
- *
- * V2 to V3
- * --------
- *	Alan Cox start some incompatibles changes. I've integrated a bit more.
- *	- Encryption renamed to Encode to avoid US regulation problems
- *	- Frequency changed from float to struct to avoid problems on old 386
- *
- * V3 to V4
- * --------
- *	- Add sensitivity
- *
- * V4 to V5
- * --------
- *	- Missing encoding definitions in range
- *	- Access points stuff
- *
- * V5 to V6
- * --------
- *	- 802.11 support (ESSID ioctls)
- *
- * V6 to V7
- * --------
- *	- define IW_ESSID_MAX_SIZE and IW_MAX_AP
- *
- * V7 to V8
- * --------
- *	- Changed my e-mail address
- *	- More 802.11 support (nickname, rate, rts, frag)
- *	- List index in frequencies
- *
- * V8 to V9
- * --------
- *	- Support for 'mode of operation' (ad-hoc, managed...)
- *	- Support for unicast and multicast power saving
- *	- Change encoding to support larger tokens (>64 bits)
- *	- Updated iw_params (disable, flags) and use it for NWID
- *	- Extracted iw_point from iwreq for clarity
- *
- * V9 to V10
- * ---------
- *	- Add PM capability to range structure
- *	- Add PM modifier : MAX/MIN/RELATIVE
- *	- Add encoding option : IW_ENCODE_NOKEY
- *	- Add TxPower ioctls (work like TxRate)
- *
- * V10 to V11
- * ----------
- *	- Add WE version in range (help backward/forward compatibility)
- *	- Add retry ioctls (work like PM)
- *
- * V11 to V12
- * ----------
- *	- Add SIOCSIWSTATS to get /proc/net/wireless programatically
- *	- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
- *	- Add new statistics (frag, retry, beacon)
- *	- Add average quality (for user space calibration)
- *
- * V12 to V13
- * ----------
- *	- Document creation of new driver API.
- *	- Extract union iwreq_data from struct iwreq (for new driver API).
- *	- Rename SIOCSIWNAME as SIOCSIWCOMMIT
- *
- * V13 to V14
- * ----------
- *	- Wireless Events support : define struct iw_event
- *	- Define additional specific event numbers
- *	- Add "addr" and "param" fields in union iwreq_data
- *	- AP scanning stuff (SIOCSIWSCAN and friends)
- *
- * V14 to V15
- * ----------
- *	- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
- *	- Make struct iw_freq signed (both m & e), add explicit padding
- *	- Add IWEVCUSTOM for driver specific event/scanning token
- *	- Add IW_MAX_GET_SPY for driver returning a lot of addresses
- *	- Add IW_TXPOW_RANGE for range of Tx Powers
- *	- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
- *	- Add IW_MODE_MONITOR for passive monitor
- *
- * V15 to V16
- * ----------
- *	- Increase the number of bitrates in iw_range to 32 (for 802.11g)
- *	- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
- *	- Reshuffle struct iw_range for increases, add filler
- *	- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
- *	- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
- *	- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
- *	- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
- *
- * V16 to V17
- * ----------
- *	- Add flags to frequency -> auto/fixed
- *	- Document (struct iw_quality *)->updated, add new flags (INVALID)
- *	- Wireless Event capability in struct iw_range
- *	- Add support for relative TxPower (yick !)
- *
- * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
- * ----------
- *	- Add support for WPA/WPA2
- *	- Add extended encoding configuration (SIOCSIWENCODEEXT and
- *	  SIOCGIWENCODEEXT)
- *	- Add SIOCSIWGENIE/SIOCGIWGENIE
- *	- Add SIOCSIWMLME
- *	- Add SIOCSIWPMKSA
- *	- Add struct iw_range bit field for supported encoding capabilities
- *	- Add optional scan request parameters for SIOCSIWSCAN
- *	- Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
- *	  related parameters (extensible up to 4096 parameter values)
- *	- Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
- *	  IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
- *
- * V18 to V19
- * ----------
- *	- Remove (struct iw_point *)->pointer from events and streams
- *	- Remove header includes to help user space
- *	- Increase IW_ENCODING_TOKEN_MAX from 32 to 64
- *	- Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
- *	- Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
- *	- Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
- *
- * V19 to V20
- * ----------
- *	- RtNetlink requests support (SET/GET)
- *
- * V20 to V21
- * ----------
- *	- Remove (struct net_device *)->get_wireless_stats()
- *	- Change length in ESSID and NICK to strlen() instead of strlen()+1
- *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
- *	- Power/Retry relative values no longer * 100000
- *	- Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
- *
- * V21 to V22
- * ----------
- *	- Prevent leaking of kernel space in stream on 64 bits.
- */
-
-/**************************** CONSTANTS ****************************/
-
-/* -------------------------- IOCTL LIST -------------------------- */
-
-/* Wireless Identification */
-#define SIOCSIWCOMMIT	0x8B00		/* Commit pending changes to driver */
-#define SIOCGIWNAME	0x8B01		/* get name == wireless protocol */
-/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
- * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
- * Don't put the name of your driver there, it's useless. */
-
-/* Basic operations */
-#define SIOCSIWNWID	0x8B02		/* set network id (pre-802.11) */
-#define SIOCGIWNWID	0x8B03		/* get network id (the cell) */
-#define SIOCSIWFREQ	0x8B04		/* set channel/frequency (Hz) */
-#define SIOCGIWFREQ	0x8B05		/* get channel/frequency (Hz) */
-#define SIOCSIWMODE	0x8B06		/* set operation mode */
-#define SIOCGIWMODE	0x8B07		/* get operation mode */
-#define SIOCSIWSENS	0x8B08		/* set sensitivity (dBm) */
-#define SIOCGIWSENS	0x8B09		/* get sensitivity (dBm) */
-
-/* Informative stuff */
-#define SIOCSIWRANGE	0x8B0A		/* Unused */
-#define SIOCGIWRANGE	0x8B0B		/* Get range of parameters */
-#define SIOCSIWPRIV	0x8B0C		/* Unused */
-#define SIOCGIWPRIV	0x8B0D		/* get private ioctl interface info */
-#define SIOCSIWSTATS	0x8B0E		/* Unused */
-#define SIOCGIWSTATS	0x8B0F		/* Get /proc/net/wireless stats */
-/* SIOCGIWSTATS is strictly used between user space and the kernel, and
- * is never passed to the driver (i.e. the driver will never see it). */
-
-/* Spy support (statistics per MAC address - used for Mobile IP support) */
-#define SIOCSIWSPY	0x8B10		/* set spy addresses */
-#define SIOCGIWSPY	0x8B11		/* get spy info (quality of link) */
-#define SIOCSIWTHRSPY	0x8B12		/* set spy threshold (spy event) */
-#define SIOCGIWTHRSPY	0x8B13		/* get spy threshold */
-
-/* Access Point manipulation */
-#define SIOCSIWAP	0x8B14		/* set access point MAC addresses */
-#define SIOCGIWAP	0x8B15		/* get access point MAC addresses */
-#define SIOCGIWAPLIST	0x8B17		/* Deprecated in favor of scanning */
-#define SIOCSIWSCAN	0x8B18		/* trigger scanning (list cells) */
-#define SIOCGIWSCAN	0x8B19		/* get scanning results */
-
-/* 802.11 specific support */
-#define SIOCSIWESSID	0x8B1A		/* set ESSID (network name) */
-#define SIOCGIWESSID	0x8B1B		/* get ESSID */
-#define SIOCSIWNICKN	0x8B1C		/* set node name/nickname */
-#define SIOCGIWNICKN	0x8B1D		/* get node name/nickname */
-/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
- * within the 'iwreq' structure, so we need to use the 'data' member to
- * point to a string in user space, like it is done for RANGE... */
-
-/* Other parameters useful in 802.11 and some other devices */
-#define SIOCSIWRATE	0x8B20		/* set default bit rate (bps) */
-#define SIOCGIWRATE	0x8B21		/* get default bit rate (bps) */
-#define SIOCSIWRTS	0x8B22		/* set RTS/CTS threshold (bytes) */
-#define SIOCGIWRTS	0x8B23		/* get RTS/CTS threshold (bytes) */
-#define SIOCSIWFRAG	0x8B24		/* set fragmentation thr (bytes) */
-#define SIOCGIWFRAG	0x8B25		/* get fragmentation thr (bytes) */
-#define SIOCSIWTXPOW	0x8B26		/* set transmit power (dBm) */
-#define SIOCGIWTXPOW	0x8B27		/* get transmit power (dBm) */
-#define SIOCSIWRETRY	0x8B28		/* set retry limits and lifetime */
-#define SIOCGIWRETRY	0x8B29		/* get retry limits and lifetime */
-
-/* Encoding stuff (scrambling, hardware security, WEP...) */
-#define SIOCSIWENCODE	0x8B2A		/* set encoding token & mode */
-#define SIOCGIWENCODE	0x8B2B		/* get encoding token & mode */
-/* Power saving stuff (power management, unicast and multicast) */
-#define SIOCSIWPOWER	0x8B2C		/* set Power Management settings */
-#define SIOCGIWPOWER	0x8B2D		/* get Power Management settings */
-/* Modulation bitmask */
-#define SIOCSIWMODUL	0x8B2E		/* set Modulations settings */
-#define SIOCGIWMODUL	0x8B2F		/* get Modulations settings */
-
-/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
- * This ioctl uses struct iw_point and data buffer that includes IE id and len
- * fields. More than one IE may be included in the request. Setting the generic
- * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
- * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
- * are required to report the used IE as a wireless event, e.g., when
- * associating with an AP. */
-#define SIOCSIWGENIE	0x8B30		/* set generic IE */
-#define SIOCGIWGENIE	0x8B31		/* get generic IE */
-
-/* WPA : IEEE 802.11 MLME requests */
-#define SIOCSIWMLME	0x8B16		/* request MLME operation; uses
-					 * struct iw_mlme */
-/* WPA : Authentication mode parameters */
-#define SIOCSIWAUTH	0x8B32		/* set authentication mode params */
-#define SIOCGIWAUTH	0x8B33		/* get authentication mode params */
-
-/* WPA : Extended version of encoding configuration */
-#define SIOCSIWENCODEEXT 0x8B34		/* set encoding token & mode */
-#define SIOCGIWENCODEEXT 0x8B35		/* get encoding token & mode */
-
-/* WPA2 : PMKSA cache management */
-#define SIOCSIWPMKSA	0x8B36		/* PMKSA cache operation */
-
-/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
-
-/* These 32 ioctl are wireless device private, for 16 commands.
- * Each driver is free to use them for whatever purpose it chooses,
- * however the driver *must* export the description of those ioctls
- * with SIOCGIWPRIV and *must* use arguments as defined below.
- * If you don't follow those rules, DaveM is going to hate you (reason :
- * it make mixed 32/64bit operation impossible).
- */
-#define SIOCIWFIRSTPRIV	0x8BE0
-#define SIOCIWLASTPRIV	0x8BFF
-/* Previously, we were using SIOCDEVPRIVATE, but we now have our
- * separate range because of collisions with other tools such as
- * 'mii-tool'.
- * We now have 32 commands, so a bit more space ;-).
- * Also, all 'even' commands are only usable by root and don't return the
- * content of ifr/iwr to user (but you are not obliged to use the set/get
- * convention, just use every other two command). More details in iwpriv.c.
- * And I repeat : you are not forced to use them with iwpriv, but you
- * must be compliant with it.
- */
-
-/* ------------------------- IOCTL STUFF ------------------------- */
-
-/* The first and the last (range) */
-#define SIOCIWFIRST	0x8B00
-#define SIOCIWLAST	SIOCIWLASTPRIV		/* 0x8BFF */
-#define IW_IOCTL_IDX(cmd)	((cmd) - SIOCIWFIRST)
-
-/* Odd : get (world access), even : set (root access) */
-#define IW_IS_SET(cmd)	(!((cmd) & 0x1))
-#define IW_IS_GET(cmd)	((cmd) & 0x1)
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/* Those are *NOT* ioctls, do not issue request on them !!! */
-/* Most events use the same identifier as ioctl requests */
-
-#define IWEVTXDROP	0x8C00		/* Packet dropped to excessive retry */
-#define IWEVQUAL	0x8C01		/* Quality part of statistics (scan) */
-#define IWEVCUSTOM	0x8C02		/* Driver specific ascii string */
-#define IWEVREGISTERED	0x8C03		/* Discovered a new node (AP mode) */
-#define IWEVEXPIRED	0x8C04		/* Expired a node (AP mode) */
-#define IWEVGENIE	0x8C05		/* Generic IE (WPA, RSN, WMM, ..)
-					 * (scan results); This includes id and
-					 * length fields. One IWEVGENIE may
-					 * contain more than one IE. Scan
-					 * results may contain one or more
-					 * IWEVGENIE events. */
-#define IWEVMICHAELMICFAILURE 0x8C06	/* Michael MIC failure
-					 * (struct iw_michaelmicfailure)
-					 */
-#define IWEVASSOCREQIE	0x8C07		/* IEs used in (Re)Association Request.
-					 * The data includes id and length
-					 * fields and may contain more than one
-					 * IE. This event is required in
-					 * Managed mode if the driver
-					 * generates its own WPA/RSN IE. This
-					 * should be sent just before
-					 * IWEVREGISTERED event for the
-					 * association. */
-#define IWEVASSOCRESPIE	0x8C08		/* IEs used in (Re)Association
-					 * Response. The data includes id and
-					 * length fields and may contain more
-					 * than one IE. This may be sent
-					 * between IWEVASSOCREQIE and
-					 * IWEVREGISTERED events for the
-					 * association. */
-#define IWEVPMKIDCAND	0x8C09		/* PMKID candidate for RSN
-					 * pre-authentication
-					 * (struct iw_pmkid_cand) */
-
-#define IWEVFIRST	0x8C00
-#define IW_EVENT_IDX(cmd)	((cmd) - IWEVFIRST)
-
-/* ------------------------- PRIVATE INFO ------------------------- */
-/*
- * The following is used with SIOCGIWPRIV. It allow a driver to define
- * the interface (name, type of data) for its private ioctl.
- * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
- */
-
-#define IW_PRIV_TYPE_MASK	0x7000	/* Type of arguments */
-#define IW_PRIV_TYPE_NONE	0x0000
-#define IW_PRIV_TYPE_BYTE	0x1000	/* Char as number */
-#define IW_PRIV_TYPE_CHAR	0x2000	/* Char as character */
-#define IW_PRIV_TYPE_INT	0x4000	/* 32 bits int */
-#define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
-#define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
-
-#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
-
-#define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */
-
-/*
- * Note : if the number of args is fixed and the size < 16 octets,
- * instead of passing a pointer we will put args in the iwreq struct...
- */
-
-/* ----------------------- OTHER CONSTANTS ----------------------- */
-
-/* Maximum frequencies in the range struct */
-#define IW_MAX_FREQUENCIES	32
-/* Note : if you have something like 80 frequencies,
- * don't increase this constant and don't fill the frequency list.
- * The user will be able to set by channel anyway... */
-
-/* Maximum bit rates in the range struct */
-#define IW_MAX_BITRATES		32
-
-/* Maximum tx powers in the range struct */
-#define IW_MAX_TXPOWER		8
-/* Note : if you more than 8 TXPowers, just set the max and min or
- * a few of them in the struct iw_range. */
-
-/* Maximum of address that you may set with SPY */
-#define IW_MAX_SPY		8
-
-/* Maximum of address that you may get in the
-   list of access points in range */
-#define IW_MAX_AP		64
-
-/* Maximum size of the ESSID and NICKN strings */
-#define IW_ESSID_MAX_SIZE	32
-
-/* Modes of operation */
-#define IW_MODE_AUTO	0	/* Let the driver decides */
-#define IW_MODE_ADHOC	1	/* Single cell network */
-#define IW_MODE_INFRA	2	/* Multi cell network, roaming, ... */
-#define IW_MODE_MASTER	3	/* Synchronisation master or Access Point */
-#define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
-#define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
-#define IW_MODE_MONITOR	6	/* Passive monitor (listen only) */
-
-/* Statistics flags (bitmask in updated) */
-#define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
-#define IW_QUAL_LEVEL_UPDATED	0x02
-#define IW_QUAL_NOISE_UPDATED	0x04
-#define IW_QUAL_ALL_UPDATED	0x07
-#define IW_QUAL_DBM		0x08	/* Level + Noise are dBm */
-#define IW_QUAL_QUAL_INVALID	0x10	/* Driver doesn't provide value */
-#define IW_QUAL_LEVEL_INVALID	0x20
-#define IW_QUAL_NOISE_INVALID	0x40
-#define IW_QUAL_RCPI		0x80	/* Level + Noise are 802.11k RCPI */
-#define IW_QUAL_ALL_INVALID	0x70
-
-/* Frequency flags */
-#define IW_FREQ_AUTO		0x00	/* Let the driver decides */
-#define IW_FREQ_FIXED		0x01	/* Force a specific value */
-
-/* Maximum number of size of encoding token available
- * they are listed in the range structure */
-#define IW_MAX_ENCODING_SIZES	8
-
-/* Maximum size of the encoding token in bytes */
-#define IW_ENCODING_TOKEN_MAX	64	/* 512 bits (for now) */
-
-/* Flags for encoding (along with the token) */
-#define IW_ENCODE_INDEX		0x00FF	/* Token index (if needed) */
-#define IW_ENCODE_FLAGS		0xFF00	/* Flags defined below */
-#define IW_ENCODE_MODE		0xF000	/* Modes defined below */
-#define IW_ENCODE_DISABLED	0x8000	/* Encoding disabled */
-#define IW_ENCODE_ENABLED	0x0000	/* Encoding enabled */
-#define IW_ENCODE_RESTRICTED	0x4000	/* Refuse non-encoded packets */
-#define IW_ENCODE_OPEN		0x2000	/* Accept non-encoded packets */
-#define IW_ENCODE_NOKEY		0x0800  /* Key is write only, so not present */
-#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
-
-/* Power management flags available (along with the value, if any) */
-#define IW_POWER_ON		0x0000	/* No details... */
-#define IW_POWER_TYPE		0xF000	/* Type of parameter */
-#define IW_POWER_PERIOD		0x1000	/* Value is a period/duration of  */
-#define IW_POWER_TIMEOUT	0x2000	/* Value is a timeout (to go asleep) */
-#define IW_POWER_SAVING		0x4000	/* Value is relative (how aggressive)*/
-#define IW_POWER_MODE		0x0F00	/* Power Management mode */
-#define IW_POWER_UNICAST_R	0x0100	/* Receive only unicast messages */
-#define IW_POWER_MULTICAST_R	0x0200	/* Receive only multicast messages */
-#define IW_POWER_ALL_R		0x0300	/* Receive all messages though PM */
-#define IW_POWER_FORCE_S	0x0400	/* Force PM procedure for sending unicast */
-#define IW_POWER_REPEATER	0x0800	/* Repeat broadcast messages in PM period */
-#define IW_POWER_MODIFIER	0x000F	/* Modify a parameter */
-#define IW_POWER_MIN		0x0001	/* Value is a minimum  */
-#define IW_POWER_MAX		0x0002	/* Value is a maximum */
-#define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
-
-/* Transmit Power flags available */
-#define IW_TXPOW_TYPE		0x00FF	/* Type of value */
-#define IW_TXPOW_DBM		0x0000	/* Value is in dBm */
-#define IW_TXPOW_MWATT		0x0001	/* Value is in mW */
-#define IW_TXPOW_RELATIVE	0x0002	/* Value is in arbitrary units */
-#define IW_TXPOW_RANGE		0x1000	/* Range of value between min/max */
-
-/* Retry limits and lifetime flags available */
-#define IW_RETRY_ON		0x0000	/* No details... */
-#define IW_RETRY_TYPE		0xF000	/* Type of parameter */
-#define IW_RETRY_LIMIT		0x1000	/* Maximum number of retries*/
-#define IW_RETRY_LIFETIME	0x2000	/* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER	0x00FF	/* Modify a parameter */
-#define IW_RETRY_MIN		0x0001	/* Value is a minimum  */
-#define IW_RETRY_MAX		0x0002	/* Value is a maximum */
-#define IW_RETRY_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
-#define IW_RETRY_SHORT		0x0010	/* Value is for short packets  */
-#define IW_RETRY_LONG		0x0020	/* Value is for long packets */
-
-/* Scanning request flags */
-#define IW_SCAN_DEFAULT		0x0000	/* Default scan of the driver */
-#define IW_SCAN_ALL_ESSID	0x0001	/* Scan all ESSIDs */
-#define IW_SCAN_THIS_ESSID	0x0002	/* Scan only this ESSID */
-#define IW_SCAN_ALL_FREQ	0x0004	/* Scan all Frequencies */
-#define IW_SCAN_THIS_FREQ	0x0008	/* Scan only this Frequency */
-#define IW_SCAN_ALL_MODE	0x0010	/* Scan all Modes */
-#define IW_SCAN_THIS_MODE	0x0020	/* Scan only this Mode */
-#define IW_SCAN_ALL_RATE	0x0040	/* Scan all Bit-Rates */
-#define IW_SCAN_THIS_RATE	0x0080	/* Scan only this Bit-Rate */
-/* struct iw_scan_req scan_type */
-#define IW_SCAN_TYPE_ACTIVE 0
-#define IW_SCAN_TYPE_PASSIVE 1
-/* Maximum size of returned data */
-#define IW_SCAN_MAX_DATA	4096	/* In bytes */
-
-/* Max number of char in custom event - use multiple of them if needed */
-#define IW_CUSTOM_MAX		256	/* In bytes */
-
-/* Generic information element */
-#define IW_GENERIC_IE_MAX	1024
-
-/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
-#define IW_MLME_DEAUTH		0
-#define IW_MLME_DISASSOC	1
-#define IW_MLME_AUTH		2
-#define IW_MLME_ASSOC		3
-
-/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
-#define IW_AUTH_INDEX		0x0FFF
-#define IW_AUTH_FLAGS		0xF000
-/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
- * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
- * parameter that is being set/get to; value will be read/written to
- * struct iw_param value field) */
-#define IW_AUTH_WPA_VERSION		0
-#define IW_AUTH_CIPHER_PAIRWISE		1
-#define IW_AUTH_CIPHER_GROUP		2
-#define IW_AUTH_KEY_MGMT		3
-#define IW_AUTH_TKIP_COUNTERMEASURES	4
-#define IW_AUTH_DROP_UNENCRYPTED	5
-#define IW_AUTH_80211_AUTH_ALG		6
-#define IW_AUTH_WPA_ENABLED		7
-#define IW_AUTH_RX_UNENCRYPTED_EAPOL	8
-#define IW_AUTH_ROAMING_CONTROL		9
-#define IW_AUTH_PRIVACY_INVOKED		10
-
-/* IW_AUTH_WPA_VERSION values (bit field) */
-#define IW_AUTH_WPA_VERSION_DISABLED	0x00000001
-#define IW_AUTH_WPA_VERSION_WPA		0x00000002
-#define IW_AUTH_WPA_VERSION_WPA2	0x00000004
-
-/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
-#define IW_AUTH_CIPHER_NONE	0x00000001
-#define IW_AUTH_CIPHER_WEP40	0x00000002
-#define IW_AUTH_CIPHER_TKIP	0x00000004
-#define IW_AUTH_CIPHER_CCMP	0x00000008
-#define IW_AUTH_CIPHER_WEP104	0x00000010
-
-/* IW_AUTH_KEY_MGMT values (bit field) */
-#define IW_AUTH_KEY_MGMT_802_1X	1
-#define IW_AUTH_KEY_MGMT_PSK	2
-
-/* IW_AUTH_80211_AUTH_ALG values (bit field) */
-#define IW_AUTH_ALG_OPEN_SYSTEM	0x00000001
-#define IW_AUTH_ALG_SHARED_KEY	0x00000002
-#define IW_AUTH_ALG_LEAP	0x00000004
-
-/* IW_AUTH_ROAMING_CONTROL values */
-#define IW_AUTH_ROAMING_ENABLE	0	/* driver/firmware based roaming */
-#define IW_AUTH_ROAMING_DISABLE	1	/* user space program used for roaming
-					 * control */
-
-/* SIOCSIWENCODEEXT definitions */
-#define IW_ENCODE_SEQ_MAX_SIZE	8
-/* struct iw_encode_ext ->alg */
-#define IW_ENCODE_ALG_NONE	0
-#define IW_ENCODE_ALG_WEP	1
-#define IW_ENCODE_ALG_TKIP	2
-#define IW_ENCODE_ALG_CCMP	3
-/* struct iw_encode_ext ->ext_flags */
-#define IW_ENCODE_EXT_TX_SEQ_VALID	0x00000001
-#define IW_ENCODE_EXT_RX_SEQ_VALID	0x00000002
-#define IW_ENCODE_EXT_GROUP_KEY		0x00000004
-#define IW_ENCODE_EXT_SET_TX_KEY	0x00000008
-
-/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
-#define IW_MICFAILURE_KEY_ID	0x00000003 /* Key ID 0..3 */
-#define IW_MICFAILURE_GROUP	0x00000004
-#define IW_MICFAILURE_PAIRWISE	0x00000008
-#define IW_MICFAILURE_STAKEY	0x00000010
-#define IW_MICFAILURE_COUNT	0x00000060 /* 1 or 2 (0 = count not supported)
-					    */
-
-/* Bit field values for enc_capa in struct iw_range */
-#define IW_ENC_CAPA_WPA		0x00000001
-#define IW_ENC_CAPA_WPA2	0x00000002
-#define IW_ENC_CAPA_CIPHER_TKIP	0x00000004
-#define IW_ENC_CAPA_CIPHER_CCMP	0x00000008
-
-/* Event capability macros - in (struct iw_range *)->event_capa
- * Because we have more than 32 possible events, we use an array of
- * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
-#define IW_EVENT_CAPA_BASE(cmd)		((cmd >= SIOCIWFIRSTPRIV) ? \
-					 (cmd - SIOCIWFIRSTPRIV + 0x60) : \
-					 (cmd - SIOCSIWCOMMIT))
-#define IW_EVENT_CAPA_INDEX(cmd)	(IW_EVENT_CAPA_BASE(cmd) >> 5)
-#define IW_EVENT_CAPA_MASK(cmd)		(1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
-/* Event capability constants - event autogenerated by the kernel
- * This list is valid for most 802.11 devices, customise as needed... */
-#define IW_EVENT_CAPA_K_0	(IW_EVENT_CAPA_MASK(0x8B04) | \
-				 IW_EVENT_CAPA_MASK(0x8B06) | \
-				 IW_EVENT_CAPA_MASK(0x8B1A))
-#define IW_EVENT_CAPA_K_1	(IW_EVENT_CAPA_MASK(0x8B2A))
-/* "Easy" macro to set events in iw_range (less efficient) */
-#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
-#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
-
-/* Modulations bitmasks */
-#define IW_MODUL_ALL		0x00000000	/* Everything supported */
-#define IW_MODUL_FH		0x00000001	/* Frequency Hopping */
-#define IW_MODUL_DS		0x00000002	/* Original Direct Sequence */
-#define IW_MODUL_CCK		0x00000004	/* 802.11b : 5.5 + 11 Mb/s */
-#define IW_MODUL_11B		(IW_MODUL_DS | IW_MODUL_CCK)
-#define IW_MODUL_PBCC		0x00000008	/* TI : 5.5 + 11 + 22 Mb/s */
-#define IW_MODUL_OFDM_A		0x00000010	/* 802.11a : 54 Mb/s */
-#define IW_MODUL_11A		(IW_MODUL_OFDM_A)
-#define IW_MODUL_11AB		(IW_MODUL_11B | IW_MODUL_11A)
-#define IW_MODUL_OFDM_G		0x00000020	/* 802.11g : 54 Mb/s */
-#define IW_MODUL_11G		(IW_MODUL_11B | IW_MODUL_OFDM_G)
-#define IW_MODUL_11AG		(IW_MODUL_11G | IW_MODUL_11A)
-#define IW_MODUL_TURBO		0x00000040	/* ATH : bonding, 108 Mb/s */
-/* In here we should define MIMO stuff. Later... */
-#define IW_MODUL_CUSTOM		0x40000000	/* Driver specific */
-
-/* Bitrate flags available */
-#define IW_BITRATE_TYPE		0x00FF	/* Type of value */
-#define IW_BITRATE_UNICAST	0x0001	/* Maximum/Fixed unicast bitrate */
-#define IW_BITRATE_BROADCAST	0x0002	/* Fixed broadcast bitrate */
-
-/****************************** TYPES ******************************/
-
-/* --------------------------- SUBTYPES --------------------------- */
-/*
- *	Generic format for most parameters that fit in an int
- */
-struct	iw_param
-{
-  int32_t		value;		/* The value of the parameter itself */
-  uint8_t		fixed;		/* Hardware should not use auto select */
-  uint8_t		disabled;	/* Disable the feature */
-  uint16_t		flags;		/* Various specifc flags (if any) */
-};
-
-/*
- *	For all data larger than 16 octets, we need to use a
- *	pointer to memory allocated in user space.
- */
-struct	iw_point
-{
-  void 			*pointer;	/* Pointer to the data  (in user space) */
-  uint16_t		length;		/* number of fields or size in bytes */
-  uint16_t		flags;		/* Optional params */
-};
-
-/*
- *	A frequency
- *	For numbers lower than 10^9, we encode the number in 'm' and
- *	set 'e' to 0
- *	For number greater than 10^9, we divide it by the lowest power
- *	of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
- *	The power of 10 is in 'e', the result of the division is in 'm'.
- */
-struct	iw_freq
-{
-	int32_t		m;		/* Mantissa */
-	int16_t		e;		/* Exponent */
-	uint8_t		i;		/* List index (when in range struct) */
-	uint8_t		flags;		/* Flags (fixed/auto) */
-};
-
-/*
- *	Quality of the link
- */
-struct	iw_quality
-{
-	uint8_t		qual;		/* link quality (%retries, SNR,
-					   %missed beacons or better...) */
-	uint8_t		level;		/* signal level (dBm) */
-	uint8_t		noise;		/* noise level (dBm) */
-	uint8_t		updated;	/* Flags to know if updated */
-};
-
-/*
- *	Packet discarded in the wireless adapter due to
- *	"wireless" specific problems...
- *	Note : the list of counter and statistics in net_device_stats
- *	is already pretty exhaustive, and you should use that first.
- *	This is only additional stats...
- */
-struct	iw_discarded
-{
-	uint32_t		nwid;		/* Rx : Wrong nwid/essid */
-	uint32_t		code;		/* Rx : Unable to code/decode (WEP) */
-	uint32_t		fragment;	/* Rx : Can't perform MAC reassembly */
-	uint32_t		retries;	/* Tx : Max MAC retries num reached */
-	uint32_t		misc;		/* Others cases */
-};
-
-/*
- *	Packet/Time period missed in the wireless adapter due to
- *	"wireless" specific problems...
- */
-struct	iw_missed
-{
-	uint32_t		beacon;		/* Missed beacons/superframe */
-};
-
-/*
- *	Quality range (for spy threshold)
- */
-struct	iw_thrspy
-{
-	struct sockaddr		addr;		/* Source address (hw/mac) */
-	struct iw_quality	qual;		/* Quality of the link */
-	struct iw_quality	low;		/* Low threshold */
-	struct iw_quality	high;		/* High threshold */
-};
-
-/*
- *	Optional data for scan request
- *
- *	Note: these optional parameters are controlling parameters for the
- *	scanning behavior, these do not apply to getting scan results
- *	(SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
- *	provide a merged results with all BSSes even if the previous scan
- *	request limited scanning to a subset, e.g., by specifying an SSID.
- *	Especially, scan results are required to include an entry for the
- *	current BSS if the driver is in Managed mode and associated with an AP.
- */
-struct	iw_scan_req
-{
-	uint8_t		scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
-	uint8_t		essid_len;
-	uint8_t		num_channels; /* num entries in channel_list;
-				       * 0 = scan all allowed channels */
-	uint8_t		flags; /* reserved as padding; use zero, this may
-				* be used in the future for adding flags
-				* to request different scan behavior */
-	struct sockaddr	bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
-				* individual address of a specific BSS */
-
-	/*
-	 * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
-	 * the current ESSID. This allows scan requests for specific ESSID
-	 * without having to change the current ESSID and potentially breaking
-	 * the current association.
-	 */
-	uint8_t		essid[IW_ESSID_MAX_SIZE];
-
-	/*
-	 * Optional parameters for changing the default scanning behavior.
-	 * These are based on the MLME-SCAN.request from IEEE Std 802.11.
-	 * TU is 1.024 ms. If these are set to 0, driver is expected to use
-	 * reasonable default values. min_channel_time defines the time that
-	 * will be used to wait for the first reply on each channel. If no
-	 * replies are received, next channel will be scanned after this. If
-	 * replies are received, total time waited on the channel is defined by
-	 * max_channel_time.
-	 */
-	uint32_t		min_channel_time; /* in TU */
-	uint32_t		max_channel_time; /* in TU */
-
-	struct iw_freq	channel_list[IW_MAX_FREQUENCIES];
-};
-
-/* ------------------------- WPA SUPPORT ------------------------- */
-
-/*
- *	Extended data structure for get/set encoding (this is used with
- *	SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
- *	flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
- *	only the data contents changes (key data -> this structure, including
- *	key data).
- *
- *	If the new key is the first group key, it will be set as the default
- *	TX key. Otherwise, default TX key index is only changed if
- *	IW_ENCODE_EXT_SET_TX_KEY flag is set.
- *
- *	Key will be changed with SIOCSIWENCODEEXT in all cases except for
- *	special "change TX key index" operation which is indicated by setting
- *	key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
- *
- *	tx_seq/rx_seq are only used when respective
- *	IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
- *	TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
- *	TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
- *	used only by an Authenticator (AP or an IBSS station) to get the
- *	current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
- *	RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
- *	debugging/testing.
- */
-struct	iw_encode_ext
-{
-	uint32_t		ext_flags; /* IW_ENCODE_EXT_* */
-	uint8_t		tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-	uint8_t		rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-	struct sockaddr	addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
-			       * (group) keys or unicast address for
-			       * individual keys */
-	uint16_t		alg; /* IW_ENCODE_ALG_* */
-	uint16_t		key_len;
-	uint8_t		key[1];
-};
-
-/* SIOCSIWMLME data */
-struct	iw_mlme
-{
-	uint16_t		cmd; /* IW_MLME_* */
-	uint16_t		reason_code;
-	struct sockaddr	addr;
-};
-
-/* SIOCSIWPMKSA data */
-#define IW_PMKSA_ADD		1
-#define IW_PMKSA_REMOVE		2
-#define IW_PMKSA_FLUSH		3
-
-#define IW_PMKID_LEN	16
-
-struct	iw_pmksa
-{
-	uint32_t		cmd; /* IW_PMKSA_* */
-	struct sockaddr	bssid;
-	uint8_t		pmkid[IW_PMKID_LEN];
-};
-
-/* IWEVMICHAELMICFAILURE data */
-struct	iw_michaelmicfailure
-{
-	uint32_t		flags;
-	struct sockaddr	src_addr;
-	uint8_t		tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
-};
-
-/* IWEVPMKIDCAND data */
-#define IW_PMKID_CAND_PREAUTH	0x00000001 /* RNS pre-authentication enabled */
-struct	iw_pmkid_cand
-{
-	uint32_t		flags; /* IW_PMKID_CAND_* */
-	uint32_t		index; /* the smaller the index, the higher the
-				* priority */
-	struct sockaddr	bssid;
-};
-
-/* ------------------------ WIRELESS STATS ------------------------ */
-/*
- * Wireless statistics (used for /proc/net/wireless)
- */
-struct	iw_statistics
-{
-	uint16_t		status;		/* Status
-					 * - device dependent for now */
-
-	struct iw_quality	qual;		/* Quality of the link
-						 * (instant/mean/max) */
-	struct iw_discarded	discard;	/* Packet discarded counts */
-	struct iw_missed	miss;		/* Packet missed counts */
-};
-
-/* ------------------------ IOCTL REQUEST ------------------------ */
-/*
- * This structure defines the payload of an ioctl, and is used 
- * below.
- *
- * Note that this structure should fit on the memory footprint
- * of iwreq (which is the same as ifreq), which mean a max size of
- * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
- * You should check this when increasing the structures defined
- * above in this file...
- */
-union	iwreq_data
-{
-	/* Config - generic */
-	char		name[16];
-	/* Name : used to verify the presence of  wireless extensions.
-	 * Name of the protocol/provider... */
-
-	struct iw_point	essid;		/* Extended network name */
-	struct iw_param	nwid;		/* network id (or domain - the cell) */
-	struct iw_freq	freq;		/* frequency or channel :
-					 * 0-1000 = channel
-					 * > 1000 = frequency in Hz */
-
-	struct iw_param	sens;		/* signal level threshold */
-	struct iw_param	bitrate;	/* default bit rate */
-	struct iw_param	txpower;	/* default transmit power */
-	struct iw_param	rts;		/* RTS threshold threshold */
-	struct iw_param	frag;		/* Fragmentation threshold */
-	uint32_t		mode;		/* Operation mode */
-	struct iw_param	retry;		/* Retry limits & lifetime */
-
-	struct iw_point	encoding;	/* Encoding stuff : tokens */
-	struct iw_param	power;		/* PM duration/timeout */
-	struct iw_quality qual;		/* Quality part of statistics */
-
-	struct sockaddr	ap_addr;	/* Access point address */
-	struct sockaddr	addr;		/* Destination address (hw/mac) */
-
-	struct iw_param	param;		/* Other small parameters */
-	struct iw_point	data;		/* Other large parameters */
-};
-
-/*
- * The structure to exchange data for ioctl.
- * This structure is the same as 'struct ifreq', but (re)defined for
- * convenience...
- * Do I need to remind you about structure size (32 octets) ?
- */
-struct	iwreq 
-{
-	union
-	{
-		char	ifrn_name[16];	/* if name, e.g. "eth0" */
-	} ifr_ifrn;
-
-	/* Data part (defined just above) */
-	union	iwreq_data	u;
-};
-
-/* -------------------------- IOCTL DATA -------------------------- */
-/*
- *	For those ioctl which want to exchange mode data that what could
- *	fit in the above structure...
- */
-
-/*
- *	Range of parameters
- */
-
-struct	iw_range
-{
-	/* Informative stuff (to choose between different interface) */
-	uint32_t		throughput;	/* To give an idea... */
-	/* In theory this value should be the maximum benchmarked
-	 * TCP/IP throughput, because with most of these devices the
-	 * bit rate is meaningless (overhead an co) to estimate how
-	 * fast the connection will go and pick the fastest one.
-	 * I suggest people to play with Netperf or any benchmark...
-	 */
-
-	/* NWID (or domain id) */
-	uint32_t		min_nwid;	/* Minimal NWID we are able to set */
-	uint32_t		max_nwid;	/* Maximal NWID we are able to set */
-
-	/* Old Frequency (backward compat - moved lower ) */
-	uint16_t		old_num_channels;
-	uint8_t		old_num_frequency;
-
-	/* Wireless event capability bitmasks */
-	uint32_t		event_capa[6];
-
-	/* signal level threshold range */
-	int32_t		sensitivity;
-
-	/* Quality of link & SNR stuff */
-	/* Quality range (link, level, noise)
-	 * If the quality is absolute, it will be in the range [0 ; max_qual],
-	 * if the quality is dBm, it will be in the range [max_qual ; 0].
-	 * Don't forget that we use 8 bit arithmetics... */
-	struct iw_quality	max_qual;	/* Quality of the link */
-	/* This should contain the average/typical values of the quality
-	 * indicator. This should be the threshold between a "good" and
-	 * a "bad" link (example : monitor going from green to orange).
-	 * Currently, user space apps like quality monitors don't have any
-	 * way to calibrate the measurement. With this, they can split
-	 * the range between 0 and max_qual in different quality level
-	 * (using a geometric subdivision centered on the average).
-	 * I expect that people doing the user space apps will feedback
-	 * us on which value we need to put in each driver... */
-	struct iw_quality	avg_qual;	/* Quality of the link */
-
-	/* Rates */
-	uint8_t		num_bitrates;	/* Number of entries in the list */
-	int32_t		bitrate[IW_MAX_BITRATES];	/* list, in bps */
-
-	/* RTS threshold */
-	int32_t		min_rts;	/* Minimal RTS threshold */
-	int32_t		max_rts;	/* Maximal RTS threshold */
-
-	/* Frag threshold */
-	int32_t		min_frag;	/* Minimal frag threshold */
-	int32_t		max_frag;	/* Maximal frag threshold */
-
-	/* Power Management duration & timeout */
-	int32_t		min_pmp;	/* Minimal PM period */
-	int32_t		max_pmp;	/* Maximal PM period */
-	int32_t		min_pmt;	/* Minimal PM timeout */
-	int32_t		max_pmt;	/* Maximal PM timeout */
-	uint16_t		pmp_flags;	/* How to decode max/min PM period */
-	uint16_t		pmt_flags;	/* How to decode max/min PM timeout */
-	uint16_t		pm_capa;	/* What PM options are supported */
-
-	/* Encoder stuff */
-	uint16_t	encoding_size[IW_MAX_ENCODING_SIZES];	/* Different token sizes */
-	uint8_t	num_encoding_sizes;	/* Number of entry in the list */
-	uint8_t	max_encoding_tokens;	/* Max number of tokens */
-	/* For drivers that need a "login/passwd" form */
-	uint8_t	encoding_login_index;	/* token index for login token */
-
-	/* Transmit power */
-	uint16_t		txpower_capa;	/* What options are supported */
-	uint8_t		num_txpower;	/* Number of entries in the list */
-	int32_t		txpower[IW_MAX_TXPOWER];	/* list, in bps */
-
-	/* Wireless Extension version info */
-	uint8_t		we_version_compiled;	/* Must be WIRELESS_EXT */
-	uint8_t		we_version_source;	/* Last update of source */
-
-	/* Retry limits and lifetime */
-	uint16_t		retry_capa;	/* What retry options are supported */
-	uint16_t		retry_flags;	/* How to decode max/min retry limit */
-	uint16_t		r_time_flags;	/* How to decode max/min retry life */
-	int32_t		min_retry;	/* Minimal number of retries */
-	int32_t		max_retry;	/* Maximal number of retries */
-	int32_t		min_r_time;	/* Minimal retry lifetime */
-	int32_t		max_r_time;	/* Maximal retry lifetime */
-
-	/* Frequency */
-	uint16_t		num_channels;	/* Number of channels [0; num - 1] */
-	uint8_t		num_frequency;	/* Number of entry in the list */
-	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
-	/* Note : this frequency list doesn't need to fit channel numbers,
-	 * because each entry contain its channel index */
-
-	uint32_t		enc_capa;	/* IW_ENC_CAPA_* bit field */
-
-	/* More power management stuff */
-	int32_t		min_pms;	/* Minimal PM saving */
-	int32_t		max_pms;	/* Maximal PM saving */
-	uint16_t		pms_flags;	/* How to decode max/min PM saving */
-
-	/* All available modulations for driver (hw may support less) */
-	int32_t		modul_capa;	/* IW_MODUL_* bit field */
-
-	/* More bitrate stuff */
-	uint32_t		bitrate_capa;	/* Types of bitrates supported */
-};
-
-/*
- * Private ioctl interface information
- */
- 
-struct	iw_priv_args
-{
-	uint32_t		cmd;		/* Number of the ioctl to issue */
-	uint16_t		set_args;	/* Type and number of args */
-	uint16_t		get_args;	/* Type and number of args */
-	char		name[16];	/* Name of the extension */
-};
-
-/* ----------------------- WIRELESS EVENTS ----------------------- */
-/*
- * Wireless events are carried through the rtnetlink socket to user
- * space. They are encapsulated in the IFLA_WIRELESS field of
- * a RTM_NEWLINK message.
- */
-
-/*
- * A Wireless Event. Contains basically the same data as the ioctl...
- */
-struct iw_event
-{
-	uint16_t		len;			/* Real lenght of this stuff */
-	uint16_t		cmd;			/* Wireless IOCTL */
-	union iwreq_data	u;		/* IOCTL fixed payload */
-};
-
-/* Size of the Event prefix (including padding and alignement junk) */
-#define IW_EV_LCP_LEN	(sizeof(struct iw_event) - sizeof(union iwreq_data))
-/* Size of the various events */
-#define IW_EV_CHAR_LEN	(IW_EV_LCP_LEN + IFNAMSIZ)
-#define IW_EV_UINT_LEN	(IW_EV_LCP_LEN + sizeof(uint32_t))
-#define IW_EV_FREQ_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_LEN	(IW_EV_LCP_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_quality))
-
-/* iw_point events are special. First, the payload (extra data) come at
- * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
- * we omit the pointer, so start at an offset. */
-#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
-			  (char *) NULL)
-#define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \
-			 IW_EV_POINT_OFF)
-
-/* Size of the Event prefix when packed in stream */
-#define IW_EV_LCP_PK_LEN	(4)
-/* Size of the various events when packed in stream */
-#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)
-#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(uint32_t))
-#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
-#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
-#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
-#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
-#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_PK_LEN + 4)
-
-#endif	/* _LINUX_WIRELESS_H */
diff --git a/libs/iwinfo/src/iwinfo.h b/libs/iwinfo/src/iwinfo.h
deleted file mode 100644
index cbb9b69a30..0000000000
--- a/libs/iwinfo/src/iwinfo.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef __IWINFO_H_
-#define __IWINFO_H_
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <glob.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <stdint.h>
-
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <errno.h>
-
-#include "iwinfo_wext.h"
-
-#ifdef USE_WL
-#include "iwinfo_wl.h"
-#endif
-
-#ifdef USE_MADWIFI
-#include "iwinfo_madwifi.h"
-#endif
-
-
-#define IWINFO_BUFSIZE	24 * 1024
-
-struct iwinfo_assoclist_entry {
-	uint8_t	mac[6];
-	int8_t signal;
-	int8_t noise;
-};
-
-struct iwinfo_txpwrlist_entry {
-	uint8_t	dbm;
-	uint8_t	mw;
-};
-
-struct iwinfo_freqlist_entry {
-	uint8_t channel;
-	uint32_t mhz;
-};
-
-struct iwinfo_crypto_entry {
-	uint8_t	enabled;
-	uint8_t wpa_version;
-	uint8_t group_ciphers;
-	uint8_t pair_ciphers;
-	uint8_t auth_suites;
-};
-
-struct iwinfo_scanlist_entry {
-	uint8_t mac[6];
-	uint8_t ssid[IW_ESSID_MAX_SIZE+1];
-	uint8_t mode[8];
-	uint8_t channel;
-	uint8_t signal;
-	uint8_t quality;
-	uint8_t quality_max;
-	struct iwinfo_crypto_entry crypto;
-};
-
-#endif
-
diff --git a/libs/iwinfo/src/iwinfo_lualib.c b/libs/iwinfo/src/iwinfo_lualib.c
deleted file mode 100644
index 5509f4b6ae..0000000000
--- a/libs/iwinfo/src/iwinfo_lualib.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Lua Bindings
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#include "iwinfo_lualib.h"
-
-/* Determine type */
-static int iwinfo_L_type(lua_State *L)
-{
-	const char *ifname = luaL_checkstring(L, 1);
-
-#ifdef USE_MADWIFI
-	if( madwifi_probe(ifname) )
-		lua_pushstring(L, "madwifi");
-	else
-#endif
-
-#ifdef USE_WL
-	if( wl_probe(ifname) )
-		lua_pushstring(L, "wl");
-	else
-#endif
-
-	if( wext_probe(ifname) )
-		lua_pushstring(L, "wext");
-
-	else
-		lua_pushnil(L);
-
-	return 1;
-}
-
-/* Wrapper for assoclist */
-static int iwinfo_L_assoclist(lua_State *L, int (*func)(const char *, char *, int *))
-{
-	int i, len;
-	char rv[IWINFO_BUFSIZE];
-	char macstr[18];
-	const char *ifname = luaL_checkstring(L, 1);
-	struct iwinfo_assoclist_entry *e;
-
-	lua_newtable(L);
-	memset(rv, 0, sizeof(rv));
-
-	if( !(*func)(ifname, rv, &len) )
-	{
-		for( i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry) )
-		{
-			e = (struct iwinfo_assoclist_entry *) &rv[i];
-
-			sprintf(macstr, "%02X:%02X:%02X:%02X:%02X:%02X",
-				e->mac[0], e->mac[1], e->mac[2],
-				e->mac[3], e->mac[4], e->mac[5]);
-
-			lua_newtable(L);
-
-			lua_pushnumber(L, e->signal);
-			lua_setfield(L, -2, "signal");
-			
-			lua_pushnumber(L, e->noise);
-			lua_setfield(L, -2, "noise");
-
-			lua_setfield(L, -2, macstr);
-		}
-	}
-
-	return 1;
-}
-
-/* Wrapper for tx power list */
-static int iwinfo_L_txpwrlist(lua_State *L, int (*func)(const char *, char *, int *))
-{
-	int i, x, len;
-	char rv[IWINFO_BUFSIZE];
-	const char *ifname = luaL_checkstring(L, 1);
-	struct iwinfo_txpwrlist_entry *e;
-
-	lua_newtable(L);
-	memset(rv, 0, sizeof(rv));
-
-	if( !(*func)(ifname, rv, &len) )
-	{
-		for( i = 0, x = 1; i < len; i += sizeof(struct iwinfo_txpwrlist_entry), x++ )
-		{
-			e = (struct iwinfo_txpwrlist_entry *) &rv[i];
-
-			lua_newtable(L);
-
-			lua_pushnumber(L, e->mw);
-			lua_setfield(L, -2, "mw");
-			
-			lua_pushnumber(L, e->dbm);
-			lua_setfield(L, -2, "dbm");
-
-			lua_rawseti(L, -2, x);
-		}
-	}
-
-	return 1;
-}
-
-/* Wrapper for scan list */
-static int iwinfo_L_scanlist(lua_State *L, int (*func)(const char *, char *, int *))
-{
-	int i, j, x, y, len;
-	char rv[IWINFO_BUFSIZE];
-	char macstr[18];
-	const char *ifname = luaL_checkstring(L, 1);
-	struct iwinfo_scanlist_entry *e;
-
-	lua_newtable(L);
-	memset(rv, 0, sizeof(rv));
-
-	if( !(*func)(ifname, rv, &len) )
-	{
-		for( i = 0, x = 1; i < len; i += sizeof(struct iwinfo_scanlist_entry), x++ )
-		{
-			e = (struct iwinfo_scanlist_entry *) &rv[i];
-
-			lua_newtable(L);
-
-			/* BSSID */
-			sprintf(macstr, "%02X:%02X:%02X:%02X:%02X:%02X",
-				e->mac[0], e->mac[1], e->mac[2],
-				e->mac[3], e->mac[4], e->mac[5]);
-
-			lua_pushstring(L, macstr);
-			lua_setfield(L, -2, "bssid");
-
-			/* ESSID */
-			if( e->ssid[0] )
-			{
-				lua_pushstring(L, (char *) e->ssid);
-				lua_setfield(L, -2, "ssid");
-			}
-
-			/* Channel */
-			lua_pushinteger(L, e->channel);
-			lua_setfield(L, -2, "channel");
-
-			/* Mode */
-			lua_pushstring(L, (char *) e->mode);
-			lua_setfield(L, -2, "mode");
-
-			/* Quality, Signal */
-			lua_pushinteger(L, e->quality);
-			lua_setfield(L, -2, "quality");
-
-			lua_pushinteger(L, e->quality_max);
-			lua_setfield(L, -2, "quality_max");
-
-			lua_pushnumber(L, (e->signal - 0x100));
-			lua_setfield(L, -2, "signal");
-
-			/* Crypto */
-			lua_pushboolean(L, (!e->crypto.wpa_version && e->crypto.enabled));
-			lua_setfield(L, -2, "wep");
-
-			if( e->crypto.wpa_version )
-			{
-				lua_pushinteger(L, e->crypto.wpa_version);
-				lua_setfield(L, -2, "wpa");
-
-				lua_newtable(L);
-				for( j = 0, y = 1; j < IW_IE_CYPHER_NUM; j++ )
-				{
-					if( e->crypto.group_ciphers & (1<<j) )
-					{
-						lua_pushstring(L, iw_ie_cypher_name[j]);
-						lua_rawseti(L, -2, y++);
-					}
-				}
-				lua_setfield(L, -2, "group_ciphers");
-
-				lua_newtable(L);
-				for( j = 0, y = 1; j < IW_IE_CYPHER_NUM; j++ )
-				{
-					if( e->crypto.pair_ciphers & (1<<j) )
-					{
-						lua_pushstring(L, iw_ie_cypher_name[j]);
-						lua_rawseti(L, -2, y++);
-					}
-				}
-				lua_setfield(L, -2, "pair_ciphers");
-
-				lua_newtable(L);
-				for( j = 0, y = 1; j < IW_IE_KEY_MGMT_NUM; j++ )
-				{
-					if( e->crypto.auth_suites & (1<<j) )
-					{
-						lua_pushstring(L, iw_ie_key_mgmt_name[j]);
-						lua_rawseti(L, -2, y++);
-					}
-				}
-				lua_setfield(L, -2, "auth_suites");
-			}
-
-			lua_rawseti(L, -2, x);
-		}
-	}
-
-	return 1;
-}
-
-/* Wrapper for frequency list */
-static int iwinfo_L_freqlist(lua_State *L, int (*func)(const char *, char *, int *))
-{
-	int i, x, len;
-	char rv[IWINFO_BUFSIZE];
-	const char *ifname = luaL_checkstring(L, 1);
-	struct iwinfo_freqlist_entry *e;
-
-	lua_newtable(L);
-	memset(rv, 0, sizeof(rv));
-
-	if( !(*func)(ifname, rv, &len) )
-	{
-		for( i = 0, x = 1; i < len; i += sizeof(struct iwinfo_freqlist_entry), x++ )
-		{
-			e = (struct iwinfo_freqlist_entry *) &rv[i];
-
-			lua_newtable(L);
-
-			/* MHz */
-			lua_pushinteger(L, e->mhz);
-			lua_setfield(L, -2, "mhz");
-
-			/* Channel */
-			lua_pushinteger(L, e->channel);
-			lua_setfield(L, -2, "channel");
-
-			lua_rawseti(L, -2, x);
-		}
-	}
-
-	return 1;
-}
-
-#ifdef USE_WL
-/* Broadcom */
-LUA_WRAP_INT(wl,channel)
-LUA_WRAP_INT(wl,frequency)
-LUA_WRAP_INT(wl,bitrate)
-LUA_WRAP_INT(wl,signal)
-LUA_WRAP_INT(wl,noise)
-LUA_WRAP_INT(wl,quality)
-LUA_WRAP_INT(wl,quality_max)
-LUA_WRAP_INT(wl,mbssid_support)
-LUA_WRAP_STRING(wl,mode)
-LUA_WRAP_STRING(wl,ssid)
-LUA_WRAP_STRING(wl,bssid)
-LUA_WRAP_STRING(wl,enctype)
-LUA_WRAP_LIST(wl,assoclist)
-LUA_WRAP_LIST(wl,txpwrlist)
-LUA_WRAP_LIST(wl,scanlist)
-LUA_WRAP_LIST(wl,freqlist)
-#endif
-
-#ifdef USE_MADWIFI
-/* Madwifi */
-LUA_WRAP_INT(madwifi,channel)
-LUA_WRAP_INT(madwifi,frequency)
-LUA_WRAP_INT(madwifi,bitrate)
-LUA_WRAP_INT(madwifi,signal)
-LUA_WRAP_INT(madwifi,noise)
-LUA_WRAP_INT(madwifi,quality)
-LUA_WRAP_INT(madwifi,quality_max)
-LUA_WRAP_INT(madwifi,mbssid_support)
-LUA_WRAP_STRING(madwifi,mode)
-LUA_WRAP_STRING(madwifi,ssid)
-LUA_WRAP_STRING(madwifi,bssid)
-LUA_WRAP_STRING(madwifi,enctype)
-LUA_WRAP_LIST(madwifi,assoclist)
-LUA_WRAP_LIST(madwifi,txpwrlist)
-LUA_WRAP_LIST(madwifi,scanlist)
-LUA_WRAP_LIST(madwifi,freqlist)
-#endif
-
-/* Wext */
-LUA_WRAP_INT(wext,channel)
-LUA_WRAP_INT(wext,frequency)
-LUA_WRAP_INT(wext,bitrate)
-LUA_WRAP_INT(wext,signal)
-LUA_WRAP_INT(wext,noise)
-LUA_WRAP_INT(wext,quality)
-LUA_WRAP_INT(wext,quality_max)
-LUA_WRAP_INT(wext,mbssid_support)
-LUA_WRAP_STRING(wext,mode)
-LUA_WRAP_STRING(wext,ssid)
-LUA_WRAP_STRING(wext,bssid)
-LUA_WRAP_STRING(wext,enctype)
-LUA_WRAP_LIST(wext,assoclist)
-LUA_WRAP_LIST(wext,txpwrlist)
-LUA_WRAP_LIST(wext,scanlist)
-LUA_WRAP_LIST(wext,freqlist)
-
-#ifdef USE_WL
-/* Broadcom table */
-static const luaL_reg R_wl[] = {
-	LUA_REG(wl,channel),
-	LUA_REG(wl,frequency),
-	LUA_REG(wl,bitrate),
-	LUA_REG(wl,signal),
-	LUA_REG(wl,noise),
-	LUA_REG(wl,quality),
-	LUA_REG(wl,quality_max),
-	LUA_REG(wl,mode),
-	LUA_REG(wl,ssid),
-	LUA_REG(wl,bssid),
-	LUA_REG(wl,enctype),
-	LUA_REG(wl,assoclist),
-	LUA_REG(wl,txpwrlist),
-	LUA_REG(wl,scanlist),
-	LUA_REG(wl,freqlist),
-	LUA_REG(wl,mbssid_support),
-	{ NULL, NULL }
-};
-#endif
-
-#ifdef USE_MADWIFI
-/* Madwifi table */
-static const luaL_reg R_madwifi[] = {
-	LUA_REG(madwifi,channel),
-	LUA_REG(madwifi,frequency),
-	LUA_REG(madwifi,bitrate),
-	LUA_REG(madwifi,signal),
-	LUA_REG(madwifi,noise),
-	LUA_REG(madwifi,quality),
-	LUA_REG(madwifi,quality_max),
-	LUA_REG(madwifi,mode),
-	LUA_REG(madwifi,ssid),
-	LUA_REG(madwifi,bssid),
-	LUA_REG(madwifi,enctype),
-	LUA_REG(madwifi,assoclist),
-	LUA_REG(madwifi,txpwrlist),
-	LUA_REG(madwifi,scanlist),
-	LUA_REG(madwifi,freqlist),
-	LUA_REG(madwifi,mbssid_support),
-	{ NULL, NULL }
-};
-#endif
-
-/* Wext table */
-static const luaL_reg R_wext[] = {
-	LUA_REG(wext,channel),
-	LUA_REG(wext,frequency),
-	LUA_REG(wext,bitrate),
-	LUA_REG(wext,signal),
-	LUA_REG(wext,noise),
-	LUA_REG(wext,quality),
-	LUA_REG(wext,quality_max),
-	LUA_REG(wext,mode),
-	LUA_REG(wext,ssid),
-	LUA_REG(wext,bssid),
-	LUA_REG(wext,enctype),
-	LUA_REG(wext,assoclist),
-	LUA_REG(wext,txpwrlist),
-	LUA_REG(wext,scanlist),
-	LUA_REG(wext,freqlist),
-	LUA_REG(wext,mbssid_support),
-	{ NULL, NULL }
-};
-
-/* Common */
-static const luaL_reg R_common[] = {
-	{ "type", iwinfo_L_type },
-	{ NULL, NULL }
-};
-
-
-LUALIB_API int luaopen_iwinfo(lua_State *L) {
-	luaL_register(L, IWINFO_META, R_common);
-
-#ifdef USE_WL
-	luaL_newmetatable(L, IWINFO_WL_META);
-	luaL_register(L, NULL, R_wl);
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -2, "__index");
-	lua_setfield(L, -2, "wl");
-#endif
-
-#ifdef USE_MADWIFI
-	luaL_newmetatable(L, IWINFO_MADWIFI_META);
-	luaL_register(L, NULL, R_madwifi);
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -2, "__index");
-	lua_setfield(L, -2, "madwifi");
-#endif
-
-	luaL_newmetatable(L, IWINFO_WEXT_META);
-	luaL_register(L, NULL, R_wext);
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -2, "__index");
-	lua_setfield(L, -2, "wext");
-
-	return 1;
-}
-
diff --git a/libs/iwinfo/src/iwinfo_lualib.h b/libs/iwinfo/src/iwinfo_lualib.h
deleted file mode 100644
index 72697983ff..0000000000
--- a/libs/iwinfo/src/iwinfo_lualib.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Lua Headers
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#ifndef __IWINFO_LUALUB_H_
-#define __IWINFO_LUALIB_H_
-
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-
-#include "iwinfo.h"
-#include "iwinfo_wext_scan.h"
-
-
-#define IWINFO_META			"iwinfo"
-#define IWINFO_WEXT_META	"iwinfo.wext"
-
-#ifdef USE_WL
-#define IWINFO_WL_META		"iwinfo.wl"
-#endif
-
-#ifdef USE_MADWIFI
-#define IWINFO_MADWIFI_META	"iwinfo.madwifi"
-#endif
-
-
-#define LUA_REG(type,op) \
-	{ #op, iwinfo_L_##type##_##op }
-
-#define LUA_WRAP_INT(type,op) 							\
-	static int iwinfo_L_##type##_##op(lua_State *L)		\
-	{													\
-		const char *ifname = luaL_checkstring(L, 1);	\
-		int rv;											\
-		if( !type##_get_##op(ifname, &rv) )				\
-			lua_pushnumber(L, rv);						\
-		else											\
-			lua_pushnil(L);								\
-		return 1;										\
-	}
-
-#define LUA_WRAP_STRING(type,op) 						\
-	static int iwinfo_L_##type##_##op(lua_State *L)		\
-	{													\
-		const char *ifname = luaL_checkstring(L, 1);	\
-		char rv[IWINFO_BUFSIZE];						\
-		memset(rv, 0, IWINFO_BUFSIZE);					\
-		if( !type##_get_##op(ifname, rv) )				\
-			lua_pushstring(L, rv);						\
-		else											\
-			lua_pushnil(L);								\
-		return 1;										\
-	}
-
-#define LUA_WRAP_LIST(type,op)							\
-	static int iwinfo_L_##type##_##op(lua_State *L)		\
-	{													\
-		return iwinfo_L_##op(L, type##_get_##op);		\
-	}
-
-#endif
-
diff --git a/libs/iwinfo/src/iwinfo_madwifi.c b/libs/iwinfo/src/iwinfo_madwifi.c
deleted file mode 100644
index 33307022e8..0000000000
--- a/libs/iwinfo/src/iwinfo_madwifi.c
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Madwifi Backend
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- *
- * The signal handling code is derived from the official madwifi tools,
- * wlanconfig.c in particular. The encryption property handling was
- * inspired by the hostapd madwifi driver.
- */
-
-#include "iwinfo_madwifi.h"
-#include "iwinfo_wext.h"
-
-static int ioctl_socket = -1;
-
-static int madwifi_ioctl(struct iwreq *wrq, const char *ifname, int cmd, void *data, size_t len)
-{
-	/* prepare socket */
-	if( ioctl_socket == -1 )
-		ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
-
-  	strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
-
-	if( data != NULL )
-	{
-		if( len < IFNAMSIZ )
-		{
-			memcpy(wrq->u.name, data, len);
-		}
-		else
-		{
-			wrq->u.data.pointer = data;
-			wrq->u.data.length = len;
-		}
-	}
-
-	return ioctl(ioctl_socket, cmd, wrq);
-}
-
-static int get80211priv(const char *ifname, int op, void *data, size_t len)
-{
-	struct iwreq iwr;
-
-	if( madwifi_ioctl(&iwr, ifname, op, data, len) < 0 )
-		return -1;
-
-	return iwr.u.data.length;
-}
-
-static int madwifi_isvap(const char *ifname, const char *wifiname)
-{
-	int fd, ret;
-	char path[32];
-	char name[IFNAMSIZ];
-
-	ret = 0;
-
-	if( strlen(ifname) <= 9 )
-	{
-		sprintf(path, "/proc/sys/net/%s/%%parent", ifname);
-
-		if( (fd = open(path, O_RDONLY)) > -1 )
-		{
-			if( wifiname != NULL )
-			{
-				if( read(fd, name, strlen(wifiname)) == strlen(wifiname) )
-					ret = strncmp(name, wifiname, strlen(wifiname)) ? 0 : 1;
-			}
-			else if( read(fd, name, 4) == 4 )
-			{
-				ret = strncmp(name, "wifi", 4) ? 0 : 1;
-			}
-
-			(void) close(fd);
-		}
-	}
-
-	return ret;
-}
-
-static int madwifi_iswifi(const char *ifname)
-{
-	int ret;
-	char path[32];
-	struct stat s;
-
-	ret = 0;
-
-	if( strlen(ifname) <= 7 )
-	{
-		sprintf(path, "/proc/sys/dev/%s/diversity", ifname);
-
-		if( ! stat(path, &s) )
-			ret = (s.st_mode & S_IFREG);
-	}
-
-	return ret;
-}
-
-
-int madwifi_probe(const char *ifname)
-{
-	return ( madwifi_isvap(ifname, NULL) || madwifi_iswifi(ifname) );
-}
-
-int madwifi_get_mode(const char *ifname, char *buf)
-{
-	return wext_get_mode(ifname, buf);
-}
-
-int madwifi_get_ssid(const char *ifname, char *buf)
-{
-	return wext_get_ssid(ifname, buf);
-}
-
-int madwifi_get_bssid(const char *ifname, char *buf)
-{
-	return wext_get_bssid(ifname, buf);
-}
-
-int madwifi_get_channel(const char *ifname, int *buf)
-{
-	int i;
-	uint16_t freq;
-	struct iwreq wrq;
-	struct ieee80211req_chaninfo chans;
-
-	if( madwifi_ioctl(&wrq, ifname, SIOCGIWFREQ, NULL, 0) >= 0 )
-	{
-		/* Madwifi returns a Hz frequency, get it's freq list to find channel index */
-		freq = (uint16_t)(wrq.u.freq.m / 100000);
-
-		if( get80211priv(ifname, IEEE80211_IOCTL_GETCHANINFO, &chans, sizeof(chans)) >= 0 )
-		{
-			*buf = 0;
-
-			for( i = 0; i < chans.ic_nchans; i++ )
-			{
-				if( freq == chans.ic_chans[i].ic_freq )
-				{
-					*buf = chans.ic_chans[i].ic_ieee;
-					break;
-				}
-			}
-
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-int madwifi_get_frequency(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-
-	if( madwifi_ioctl(&wrq, ifname, SIOCGIWFREQ, NULL, 0) >= 0 )
-	{
-		*buf = (uint16_t)(wrq.u.freq.m / 100000);
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_bitrate(const char *ifname, int *buf)
-{
-	unsigned int mode, len, rate, rate_count;
-	uint8_t tmp[24*1024];
-	uint8_t *cp;
-	struct iwreq wrq;
-	struct ieee80211req_sta_info *si;
-
-	if( madwifi_ioctl(&wrq, ifname, SIOCGIWMODE, NULL, 0) >= 0 )
-	{
-		mode = wrq.u.mode;
-
-		/* Calculate bitrate average from associated stations in ad-hoc mode */
-		if( mode == 1 )
-		{
-			rate = rate_count = 0;
-
-			if( (len = get80211priv(ifname, IEEE80211_IOCTL_STA_INFO, tmp, 24*1024)) > 0 )
-			{
-				cp = tmp;
-
-				do {
-					si = (struct ieee80211req_sta_info *) cp;
-
-					if( si->isi_rssi > 0 )
-					{
-						rate_count++;
-						rate += ((si->isi_rates[si->isi_txrate] & IEEE80211_RATE_VAL) / 2);
-					}
-
-					cp   += si->isi_len;
-					len  -= si->isi_len;
-				} while (len >= sizeof(struct ieee80211req_sta_info));
-			}
-
-			*buf = (rate == 0 || rate_count == 0) ? 0 : (rate / rate_count) * 1000;
-			return 0;
-		}
-
-		/* Return whatever wext tells us ... */
-		return wext_get_bitrate(ifname, buf);
-	}
-
-	return -1;
-}
-
-int madwifi_get_signal(const char *ifname, int *buf)
-{
-	unsigned int mode, len, rssi, rssi_count;
-	uint8_t tmp[24*1024];
-	uint8_t *cp;
-	struct iwreq wrq;
-	struct ieee80211req_sta_info *si;
-
-	if( madwifi_ioctl(&wrq, ifname, SIOCGIWMODE, NULL, 0) >= 0 )
-	{
-		mode = wrq.u.mode;
-
-		/* Calculate signal average from associated stations in ap or ad-hoc mode */
-		if( mode == 1 )
-		{
-			rssi = rssi_count = 0;
-
-			if( (len = get80211priv(ifname, IEEE80211_IOCTL_STA_INFO, tmp, 24*1024)) > 0 )
-			{
-				cp = tmp;
-
-				do {
-					si = (struct ieee80211req_sta_info *) cp;
-
-					if( si->isi_rssi > 0 )
-					{
-						rssi_count++;
-						rssi -= (si->isi_rssi - 95);
-					}
-
-					cp   += si->isi_len;
-					len  -= si->isi_len;
-				} while (len >= sizeof(struct ieee80211req_sta_info));
-			}
-
-			*buf = (rssi == 0 || rssi_count == 0) ? 1 : -(rssi / rssi_count);
-			return 0;
-		}
-
-		/* Return whatever wext tells us ... */
-		return wext_get_signal(ifname, buf);
-	}
-
-	return -1;
-}
-
-int madwifi_get_noise(const char *ifname, int *buf)
-{
-	return wext_get_noise(ifname, buf);
-}
-
-int madwifi_get_quality(const char *ifname, int *buf)
-{
-	unsigned int mode, len, quality, quality_count;
-	uint8_t tmp[24*1024];
-	uint8_t *cp;
-	struct iwreq wrq;
-	struct ieee80211req_sta_info *si;
-
-	if( madwifi_ioctl(&wrq, ifname, SIOCGIWMODE, NULL, 0) >= 0 )
-	{
-		mode = wrq.u.mode;
-
-		/* Calculate signal average from associated stations in ad-hoc mode */
-		if( mode == 1 )
-		{
-			quality = quality_count = 0;
-
-			if( (len = get80211priv(ifname, IEEE80211_IOCTL_STA_INFO, tmp, 24*1024)) > 0 )
-			{
-				cp = tmp;
-
-				do {
-					si = (struct ieee80211req_sta_info *) cp;
-
-					if( si->isi_rssi > 0 )
-					{
-						quality_count++;
-						quality += si->isi_rssi;
-					}
-
-					cp   += si->isi_len;
-					len  -= si->isi_len;
-				} while (len >= sizeof(struct ieee80211req_sta_info));
-			}
-
-			*buf = (quality == 0 || quality_count == 0) ? 0 : (quality / quality_count);
-			return 0;
-		}
-
-		/* Return whatever wext tells us ... */
-		return wext_get_quality(ifname, buf);
-	}
-
-	return -1;
-}
-
-int madwifi_get_quality_max(const char *ifname, int *buf)
-{
-	return wext_get_quality_max(ifname, buf);
-}
-
-int madwifi_get_enctype(const char *ifname, char *buf)
-{
-	struct iwreq wrq;
-	struct ieee80211req_key wk;
-	int wpa_version = 0, ciphers = 0, key_type = 0;
-	char cipher_string[32];
-
-	sprintf(buf, "Unknown");
-
-	memset(&wrq, 0, sizeof(wrq));
-	memset(&wk, 0, sizeof(wk));
-	memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
-
-	/* Get key information */
-	if( get80211priv(ifname, IEEE80211_IOCTL_GETKEY, &wk, sizeof(wk)) >= 0 )
-		key_type = wk.ik_type;
-
-	/* Get wpa protocol version */
-	wrq.u.mode = IEEE80211_PARAM_WPA;
-	if( madwifi_ioctl(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-		wpa_version = wrq.u.mode;
-
-	/* Get used pairwise ciphers */
-	wrq.u.mode = IEEE80211_PARAM_UCASTCIPHERS;
-	if( madwifi_ioctl(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-	{
-		ciphers = wrq.u.mode;
-
-		if( wpa_version > 0 )
-		{
-			memset(cipher_string, 0, sizeof(cipher_string));
-
-			/* Looks like mixed wpa/wpa2 ? */
-			if( (ciphers & (1<<IEEE80211_CIPHER_TKIP)) && (ciphers & (1<<IEEE80211_CIPHER_AES_CCM)) )
-				wpa_version = 3;
-
-
-			if( (ciphers & (1<<IEEE80211_CIPHER_TKIP)) )
-				strcat(cipher_string, "TKIP, ");
-
-			if( (ciphers & (1<<IEEE80211_CIPHER_AES_CCM)) )
-				strcat(cipher_string, "CCMP, ");
-
-			if( (ciphers & (1<<IEEE80211_CIPHER_AES_OCB)) )
-				strcat(cipher_string, "AES-OCB, ");
-
-			if( (ciphers & (1<<IEEE80211_CIPHER_CKIP)) )
-				strcat(cipher_string, "CKIP, ");
-
-			cipher_string[strlen(cipher_string)-2] = 0;
-		}
-
-		switch(wpa_version)
-		{
-			case 3:
-				sprintf(buf, "mixed WPA/WPA2 (%s)", cipher_string);
-				break;
-
-			case 2:
-				sprintf(buf, "WPA2 (%s)", cipher_string);
-				break;
-
-			case 1:
-				sprintf(buf, "WPA (%s)", cipher_string);
-				break;
-			
-			default:
-				sprintf(buf, "%s", (key_type == 0) ? "WEP" : "None");
-		}
-	}
-
-	return 0;
-}
-
-int madwifi_get_assoclist(const char *ifname, char *buf, int *len)
-{
-	int bl, tl, noise;
-	uint8_t *cp;
-	uint8_t tmp[24*1024];
-	struct ieee80211req_sta_info *si;
-	struct iwinfo_assoclist_entry entry;
-
-	if( (tl = get80211priv(ifname, IEEE80211_IOCTL_STA_INFO, tmp, 24*1024)) > 0 )
-	{
-		cp = tmp;
-		bl = 0;
-
-		if( madwifi_get_noise(ifname, &noise) )
-			noise = 0;
-
-		do {
-			si = (struct ieee80211req_sta_info *) cp;
-
-			entry.signal = (si->isi_rssi - 95);
-			entry.noise  = noise;
-			memcpy(entry.mac, &si->isi_macaddr, 6);
-			memcpy(&buf[bl], &entry, sizeof(struct iwinfo_assoclist_entry));
-
-			bl += sizeof(struct iwinfo_assoclist_entry);
-			cp += si->isi_len;
-			tl -= si->isi_len;
-		} while (tl >= sizeof(struct ieee80211req_sta_info));
-
-		*len = bl;
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_txpwrlist(const char *ifname, char *buf, int *len)
-{
-	int rc = -1;
-	char cmd[256];
-
-	/* A wifiX device? */
-	if( madwifi_iswifi(ifname) )
-	{
-		sprintf(cmd, "wlanconfig ath-txpwr create nounit "
-			"wlandev %s wlanmode ap >/dev/null", ifname);
-
-		if( ! WEXITSTATUS(system(cmd)) )
-		{
-			rc = wext_get_txpwrlist("ath-txpwr", buf, len);
-			(void) WEXITSTATUS(system("wlanconfig ath-txpwr destroy"));
-		}
-	}
-
-	/* Its an athX ... */
-	else if( madwifi_isvap(ifname, NULL) )
-	{
-		rc = wext_get_txpwrlist(ifname, buf, len);
-	}
-
-	return rc;
-}
-
-int madwifi_get_scanlist(const char *ifname, char *buf, int *len)
-{
-	int ret;
-	char cmd[256];
-	DIR *proc;
-	struct dirent *e;
-
-	ret = -1;
-
-	/* We got a wifiX device passed, try to lookup a vap on it */
-	if( madwifi_iswifi(ifname) )
-	{
-		if( (proc = opendir("/proc/sys/net/")) != NULL )
-		{
-			while( (e = readdir(proc)) != NULL )
-			{
-				if( madwifi_isvap(e->d_name, ifname) )
-				{
-					sprintf(cmd, "ifconfig %s up", e->d_name);
-
-					if( ! WEXITSTATUS(system(cmd)) )
-					{
-						ret = wext_get_scanlist(e->d_name, buf, len);
-						break;
-					}
-				}
-			}
-
-			closedir(proc);
-		}
-
-		/* Still nothing found, try to create a vap */
-		if( ret == -1 )
-		{
-			sprintf(cmd, "wlanconfig ath-scan create nounit "
-				"wlandev %s wlanmode sta >/dev/null", ifname);
-
-			if( ! WEXITSTATUS(system(cmd)) && ! WEXITSTATUS(system("ifconfig ath-scan up")) )
-			{
-				ret = wext_get_scanlist("ath-scan", buf, len);
-
-				(void) WEXITSTATUS(system("ifconfig ath-scan down"));
-				(void) WEXITSTATUS(system("wlanconfig ath-scan destroy"));
-			}
-		}
-	}
-
-	/* Got athX device? */
-	else if( madwifi_isvap(ifname, NULL) )
-	{
-		ret = wext_get_scanlist(ifname, buf, len);
-	}
-
-	return ret;
-}
-
-int madwifi_get_freqlist(const char *ifname, char *buf, int *len)
-{
-	int i, bl;
-	int rc = -1;
-	char cmd[256];
-	struct ieee80211req_chaninfo chans;
-	struct iwinfo_freqlist_entry entry;
-
-	/* A wifiX device? */
-	if( madwifi_iswifi(ifname) )
-	{
-		sprintf(cmd, "wlanconfig ath-channels create nounit "
-			"wlandev %s wlanmode ap >/dev/null", ifname);
-
-		if( ! WEXITSTATUS(system(cmd)) )
-		{
-			rc = get80211priv("ath-channels", IEEE80211_IOCTL_GETCHANINFO, &chans, sizeof(chans));
-			(void) WEXITSTATUS(system("wlanconfig ath-channels destroy"));
-		}
-	}
-
-	/* Its an athX ... */
-	else if( madwifi_isvap(ifname, NULL) )
-	{
-		rc = get80211priv(ifname, IEEE80211_IOCTL_GETCHANINFO, &chans, sizeof(chans));
-	}
-
-
-	/* Got chaninfo? */
-	if( rc >= 0 )
-	{
-		bl = 0;
-
-		for( i = 0; i < chans.ic_nchans; i++ )
-		{
-			entry.mhz     = chans.ic_chans[i].ic_freq;
-			entry.channel = chans.ic_chans[i].ic_ieee;
-
-			memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
-			bl += sizeof(struct iwinfo_freqlist_entry);
-		}
-
-		*len = bl;
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_mbssid_support(const char *ifname, int *buf)
-{
-	/* We assume that multi bssid is always possible */
-	*buf = 1;
-	return 0;
-}
-
diff --git a/libs/iwinfo/src/iwinfo_madwifi.h b/libs/iwinfo/src/iwinfo_madwifi.h
deleted file mode 100644
index 18511c80c2..0000000000
--- a/libs/iwinfo/src/iwinfo_madwifi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Madwifi Headers
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#ifndef __IWINFO_MADWIFI_H_
-#define __IWINFO_MADWIFI_H_
-
-#include "iwinfo.h"
-#include "include/madwifi.h"
-
-int madwifi_probe(const char *ifname);
-int madwifi_get_mode(const char *ifname, char *buf);
-int madwifi_get_ssid(const char *ifname, char *buf);
-int madwifi_get_bssid(const char *ifname, char *buf);
-int madwifi_get_channel(const char *ifname, int *buf);
-int madwifi_get_frequency(const char *ifname, int *buf);
-int madwifi_get_bitrate(const char *ifname, int *buf);
-int madwifi_get_signal(const char *ifname, int *buf);
-int madwifi_get_noise(const char *ifname, int *buf);
-int madwifi_get_quality(const char *ifname, int *buf);
-int madwifi_get_quality_max(const char *ifname, int *buf);
-int madwifi_get_enctype(const char *ifname, char *buf);
-int madwifi_get_assoclist(const char *ifname, char *buf, int *len);
-int madwifi_get_txpwrlist(const char *ifname, char *buf, int *len);
-int madwifi_get_scanlist(const char *ifname, char *buf, int *len);
-int madwifi_get_freqlist(const char *ifname, char *buf, int *len);
-int madwifi_get_mbssid_support(const char *ifname, int *buf);
-
-#endif
diff --git a/libs/iwinfo/src/iwinfo_wext.c b/libs/iwinfo/src/iwinfo_wext.c
deleted file mode 100644
index 2a1b685c46..0000000000
--- a/libs/iwinfo/src/iwinfo_wext.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Backend
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- *
- * Parts of this code are derived from the Linux wireless tools, iwlib.c,
- * iwlist.c and iwconfig.c in particular.
- */
-
-#include "iwinfo.h"
-#include "iwinfo_wext.h"
-
-#define LOG10_MAGIC	1.25892541179
-
-static int ioctl_socket = -1;
-
-static double wext_freq2float(const struct iw_freq *in)
-{
-	int		i;
-	double	res = (double) in->m;
-	for(i = 0; i < in->e; i++) res *= 10;
-	return res;
-}
-
-static int wext_freq2mhz(const struct iw_freq *in)
-{
-	int i, mhz;
-
-	if( in->e == 6 )
-	{
-		return in->m;
-	}
-	else
-	{
-		mhz = in->m;
-		for(i = 0; i < in->e; i++)
-			mhz *= 10;
-
-		return (int)(mhz / 100000);
-	}
-}
-
-static int wext_dbm2mw(int in)
-{
-	double res = 1.0;
-	int ip = in / 10;
-	int fp = in % 10;
-	int k;
-
-	for(k = 0; k < ip; k++) res *= 10;
-	for(k = 0; k < fp; k++) res *= LOG10_MAGIC;
-
-	return (int)res;
-}
-
-static int wext_mw2dbm(int in)
-{
-	double fin = (double) in;
-	int res = 0;
-
-	while(fin > 10.0)
-	{
-		res += 10;
-		fin /= 10.0;
-	}
-
-	while(fin > 1.000001)
-	{
-		res += 1;
-		fin /= LOG10_MAGIC;
-	}
-
-	return res;
-}
-
-static int wext_ioctl(const char *ifname, int cmd, struct iwreq *wrq)
-{
-	/* prepare socket */
-	if( ioctl_socket == -1 )
-		ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
-
-  	strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
-	return ioctl(ioctl_socket, cmd, wrq);
-}
-
-
-int wext_probe(const char *ifname)
-{
-	struct iwreq wrq;
-
-	if(wext_ioctl(ifname, SIOCGIWNAME, &wrq) >= 0)
-		return 1;
-
-	return 0;
-}
-
-int wext_get_mode(const char *ifname, char *buf)
-{
-	struct iwreq wrq;
-
-	if(wext_ioctl(ifname, SIOCGIWMODE, &wrq) >= 0)
-	{
-		switch(wrq.u.mode)
-		{
-			case 0:
-				sprintf(buf, "Auto");
-				break;
-
-			case 1:
-				sprintf(buf, "Ad-Hoc");
-				break;
-
-			case 2:
-				sprintf(buf, "Client");
-				break;
-
-			case 3:
-				sprintf(buf, "Master");
-				break;
-
-			case 4:
-				sprintf(buf, "Repeater");
-				break;
-
-			case 5:
-				sprintf(buf, "Secondary");
-				break;
-
-			case 6:
-				sprintf(buf, "Monitor");
-				break;
-
-			default:
-				sprintf(buf, "Unknown");
-		}
-
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_ssid(const char *ifname, char *buf)
-{
-	struct iwreq wrq;
-
-	wrq.u.essid.pointer = (caddr_t) buf;
-	wrq.u.essid.length  = IW_ESSID_MAX_SIZE + 1;
-	wrq.u.essid.flags   = 0;
-
-	if(wext_ioctl(ifname, SIOCGIWESSID, &wrq) >= 0)
-		return 0;
-
-	return -1;
-}
-
-int wext_get_bssid(const char *ifname, char *buf)
-{
-	struct iwreq wrq;
-
-	if(wext_ioctl(ifname, SIOCGIWAP, &wrq) >= 0)
-	{
-		sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
-			(uint8_t)wrq.u.ap_addr.sa_data[0], (uint8_t)wrq.u.ap_addr.sa_data[1],
-			(uint8_t)wrq.u.ap_addr.sa_data[2], (uint8_t)wrq.u.ap_addr.sa_data[3],
-			(uint8_t)wrq.u.ap_addr.sa_data[4], (uint8_t)wrq.u.ap_addr.sa_data[5]);
-
-		return 0;
-	}
-
-	return -1;	
-}
-
-int wext_get_bitrate(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-
-	if(wext_ioctl(ifname, SIOCGIWRATE, &wrq) >= 0)
-	{
-		*buf = (wrq.u.bitrate.value / 1000);
-		return 0;
-	}
-
-	return -1;	
-}
-
-int wext_get_channel(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_range range;
-	double freq;
-	int i;
-
-	if(wext_ioctl(ifname, SIOCGIWFREQ, &wrq) >= 0)
-	{
-		if( wrq.u.freq.m >= 1000 )
-		{
-			freq = wext_freq2float(&wrq.u.freq);
-			wrq.u.data.pointer = (caddr_t) &range;
-			wrq.u.data.length  = sizeof(struct iw_range);
-			wrq.u.data.flags   = 0;
-
-			if(wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0)
-			{
-				for(i = 0; i < range.num_frequency; i++)
-				{
-					if( wext_freq2float(&range.freq[i]) == freq )
-					{
-						*buf = range.freq[i].i;
-						return 0;
-					}
-				}
-			}
-		}
-		else
-		{
-			*buf = wrq.u.freq.m;
-			return 0;
-		}
-	}
-
-	return -1;	
-}
-
-int wext_get_frequency(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_range range;
-	int i, channel;
-
-	if(wext_ioctl(ifname, SIOCGIWFREQ, &wrq) >= 0)
-	{
-		/* We got a channel number instead ... */
-		if( wrq.u.freq.m < 1000 )
-		{
-			channel = wrq.u.freq.m;
-			wrq.u.data.pointer = (caddr_t) &range;
-			wrq.u.data.length  = sizeof(struct iw_range);
-			wrq.u.data.flags   = 0;
-
-			if(wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0)
-			{
-				for(i = 0; i < range.num_frequency; i++)
-				{
-					if( range.freq[i].i == channel )
-					{
-						*buf = wext_freq2mhz(&range.freq[i]);
-						return 0;
-					}
-				}
-			}
-		}
-		else
-		{
-			*buf = wext_freq2mhz(&wrq.u.freq);
-			return 0;
-		}
-	}
-
-	return -1;	
-}
-
-int wext_get_signal(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_statistics stats;
-
-	wrq.u.data.pointer = (caddr_t) &stats;
-	wrq.u.data.length  = sizeof(struct iw_statistics);
-	wrq.u.data.flags   = 1;
-
-	if(wext_ioctl(ifname, SIOCGIWSTATS, &wrq) >= 0)
-	{
-		*buf = (stats.qual.level - 0x100);
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_noise(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_statistics stats;
-
-	wrq.u.data.pointer = (caddr_t) &stats;
-	wrq.u.data.length  = sizeof(struct iw_statistics);
-	wrq.u.data.flags   = 1;
-
-	if(wext_ioctl(ifname, SIOCGIWSTATS, &wrq) >= 0)
-	{
-		*buf = (stats.qual.noise - 0x100);
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_quality(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_statistics stats;
-
-	wrq.u.data.pointer = (caddr_t) &stats;
-	wrq.u.data.length  = sizeof(struct iw_statistics);
-	wrq.u.data.flags   = 1;
-
-	if(wext_ioctl(ifname, SIOCGIWSTATS, &wrq) >= 0)
-	{
-		*buf = stats.qual.qual;
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_quality_max(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-	struct iw_range range;
-
-	wrq.u.data.pointer = (caddr_t) &range;
-	wrq.u.data.length  = sizeof(struct iw_range);
-	wrq.u.data.flags   = 0;
-
-	if(wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0)
-	{
-		*buf = range.max_qual.qual;
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_enctype(const char *ifname, char *buf)
-{
-	/* Stub */
-	return -1;
-}
-
-int wext_get_assoclist(const char *ifname, char *buf, int *len)
-{
-	/* Stub */
-	return -1;
-}
-
-int wext_get_txpwrlist(const char *ifname, char *buf, int *len)
-{
-	struct iwreq wrq;
-	struct iw_range range;
-	struct iwinfo_txpwrlist_entry entry;
-	int i;
-
-	wrq.u.data.pointer = (caddr_t) &range;
-	wrq.u.data.length  = sizeof(struct iw_range);
-	wrq.u.data.flags   = 0;
-
-	if( (wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0) &&
-	    (range.num_txpower > 0) && (range.num_txpower <= IW_MAX_TXPOWER) &&
-	    !(range.txpower_capa & IW_TXPOW_RELATIVE)
-	) {
-		for( i = 0; i < range.num_txpower; i++ )
-		{
-			if( range.txpower_capa & IW_TXPOW_DBM )
-			{
-				entry.dbm = range.txpower[i];
-				entry.mw  = wext_dbm2mw(range.txpower[i]);
-			}
-
-			else if( range.txpower_capa & IW_TXPOW_MWATT )
-			{
-				entry.dbm = wext_mw2dbm(range.txpower[i]);
-				entry.mw  = range.txpower[i];
-			}
-
-			memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
-		}
-
-		*len = i * sizeof(entry);
-		return 0;
-	}
-
-	return -1;	
-}
-
-int wext_get_freqlist(const char *ifname, char *buf, int *len)
-{
-	struct iwreq wrq;
-	struct iw_range range;
-	struct iwinfo_freqlist_entry entry;
-	int i, bl;
-
-	wrq.u.data.pointer = (caddr_t) &range;
-	wrq.u.data.length  = sizeof(struct iw_range);
-	wrq.u.data.flags   = 0;
-
-	if(wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0)
-	{
-		bl = 0;
-
-		for(i = 0; i < range.num_frequency; i++)
-		{
-			entry.mhz     = wext_freq2mhz(&range.freq[i]);
-			entry.channel = range.freq[i].i;
-
-			memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
-			bl += sizeof(struct iwinfo_freqlist_entry);
-		}
-
-		*len = bl;
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_mbssid_support(const char *ifname, int *buf)
-{
-	/* No multi bssid support atm */
-	return -1;
-}
-
diff --git a/libs/iwinfo/src/iwinfo_wext.h b/libs/iwinfo/src/iwinfo_wext.h
deleted file mode 100644
index 7861fdc9f1..0000000000
--- a/libs/iwinfo/src/iwinfo_wext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Headers
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#ifndef __IWINFO_WEXT_H_
-#define __IWINFO_WEXT_H_
-
-#include "iwinfo.h"
-#include "include/wext.h"
-
-
-int wext_probe(const char *ifname);
-int wext_get_mode(const char *ifname, char *buf);
-int wext_get_ssid(const char *ifname, char *buf);
-int wext_get_bssid(const char *ifname, char *buf);
-int wext_get_channel(const char *ifname, int *buf);
-int wext_get_frequency(const char *ifname, int *buf);
-int wext_get_bitrate(const char *ifname, int *buf);
-int wext_get_signal(const char *ifname, int *buf);
-int wext_get_noise(const char *ifname, int *buf);
-int wext_get_quality(const char *ifname, int *buf);
-int wext_get_quality_max(const char *ifname, int *buf);
-int wext_get_enctype(const char *ifname, char *buf);
-int wext_get_assoclist(const char *ifname, char *buf, int *len);
-int wext_get_txpwrlist(const char *ifname, char *buf, int *len);
-int wext_get_scanlist(const char *ifname, char *buf, int *len);
-int wext_get_freqlist(const char *ifname, char *buf, int *len);
-int wext_get_mbssid_support(const char *ifname, int *buf);
-
-#endif
diff --git a/libs/iwinfo/src/iwinfo_wext_scan.c b/libs/iwinfo/src/iwinfo_wext_scan.c
deleted file mode 100644
index 202362336a..0000000000
--- a/libs/iwinfo/src/iwinfo_wext_scan.c
+++ /dev/null
@@ -1,652 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Backend
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- *
- * Parts of this code are derived from the Linux wireless tools, iwlib.c,
- * iwlist.c and iwconfig.c in particular.
- */
-
-#include "iwinfo.h"
-#include "iwinfo_wext_scan.h"
-
-
-static int ioctl_socket = -1;
-
-static int wext_ioctl(const char *ifname, int cmd, struct iwreq *wrq)
-{
-	/* prepare socket */
-	if( ioctl_socket == -1 )
-		ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
-
-  	strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
-	return ioctl(ioctl_socket, cmd, wrq);
-}
-
-static double wext_freq2float(const struct iw_freq *in)
-{
-	int		i;
-	double	res = (double) in->m;
-	for(i = 0; i < in->e; i++) res *= 10;
-	return res;
-}
-
-static int wext_extract_event(struct stream_descr *stream, struct iw_event *iwe, int wev)
-{
-	const struct iw_ioctl_description *descr = NULL;
-	int event_type = 0;
-	unsigned int event_len = 1;
-	char *pointer;
-	unsigned cmd_index;		/* *MUST* be unsigned */
-
-	/* Check for end of stream */
-	if((stream->current + IW_EV_LCP_PK_LEN) > stream->end)
-		return 0;
-
-	/* Extract the event header (to get the event id).
-	 * Note : the event may be unaligned, therefore copy... */
-	memcpy((char *) iwe, stream->current, IW_EV_LCP_PK_LEN);
-
-	/* Check invalid events */
-	if(iwe->len <= IW_EV_LCP_PK_LEN)
-		return -1;
-
-	/* Get the type and length of that event */
-	if(iwe->cmd <= SIOCIWLAST)
-	{
-		cmd_index = iwe->cmd - SIOCIWFIRST;
-		if(cmd_index < standard_ioctl_num)
-			descr = &(standard_ioctl_descr[cmd_index]);
-	}
-	else
-	{
-		cmd_index = iwe->cmd - IWEVFIRST;
-		if(cmd_index < standard_event_num)
-			descr = &(standard_event_descr[cmd_index]);
-	}
-
-	if(descr != NULL)
-		event_type = descr->header_type;
-
-	/* Unknown events -> event_type=0 => IW_EV_LCP_PK_LEN */
-	event_len = event_type_size[event_type];
-
-	/* Fixup for earlier version of WE */
-	if((wev <= 18) && (event_type == IW_HEADER_TYPE_POINT))
-		event_len += IW_EV_POINT_OFF;
-
-	/* Check if we know about this event */
-	if(event_len <= IW_EV_LCP_PK_LEN)
-	{
-		/* Skip to next event */
-		stream->current += iwe->len;
-		return 2;
-	}
-
-	event_len -= IW_EV_LCP_PK_LEN;
-
-	/* Set pointer on data */
-	if(stream->value != NULL)
-		pointer = stream->value;			/* Next value in event */
-	else
-		pointer = stream->current + IW_EV_LCP_PK_LEN;	/* First value in event */
-
-	/* Copy the rest of the event (at least, fixed part) */
-	if((pointer + event_len) > stream->end)
-	{
-		/* Go to next event */
-		stream->current += iwe->len;
-		return -2;
-	}
-
-	/* Fixup for WE-19 and later : pointer no longer in the stream */
-	/* Beware of alignement. Dest has local alignement, not packed */
-	if( (wev > 18) && (event_type == IW_HEADER_TYPE_POINT) )
-		memcpy((char *) iwe + IW_EV_LCP_LEN + IW_EV_POINT_OFF, pointer, event_len);
-	else
-		memcpy((char *) iwe + IW_EV_LCP_LEN, pointer, event_len);
-
-	/* Skip event in the stream */
-	pointer += event_len;
-
-	/* Special processing for iw_point events */
-	if(event_type == IW_HEADER_TYPE_POINT)
-	{
-		/* Check the length of the payload */
-		unsigned int extra_len = iwe->len - (event_len + IW_EV_LCP_PK_LEN);
-		if(extra_len > 0)
-		{
-			/* Set pointer on variable part (warning : non aligned) */
-			iwe->u.data.pointer = pointer;
-
-			/* Check that we have a descriptor for the command */
-			if(descr == NULL)
-				/* Can't check payload -> unsafe... */
-				iwe->u.data.pointer = NULL;	/* Discard paylod */
-			else
-			{
-				/* Those checks are actually pretty hard to trigger,
-				* because of the checks done in the kernel... */
-
-				unsigned int	token_len = iwe->u.data.length * descr->token_size;
-
-				/* Ugly fixup for alignement issues.
-				* If the kernel is 64 bits and userspace 32 bits,
-				* we have an extra 4+4 bytes.
-				* Fixing that in the kernel would break 64 bits userspace. */
-				if((token_len != extra_len) && (extra_len >= 4))
-				{
-					uint16_t alt_dlen = *((uint16_t *) pointer);
-					unsigned int alt_token_len = alt_dlen * descr->token_size;
-					if((alt_token_len + 8) == extra_len)
-					{
-						/* Ok, let's redo everything */
-						pointer -= event_len;
-						pointer += 4;
-						/* Dest has local alignement, not packed */
-						memcpy((char *) iwe + IW_EV_LCP_LEN + IW_EV_POINT_OFF, pointer, event_len);
-						pointer += event_len + 4;
-						iwe->u.data.pointer = pointer;
-						token_len = alt_token_len;
-					}
-				}
-
-				/* Discard bogus events which advertise more tokens than
-				* what they carry... */
-				if(token_len > extra_len)
-					iwe->u.data.pointer = NULL;	/* Discard paylod */
-
-				/* Check that the advertised token size is not going to
-				* produce buffer overflow to our caller... */
-				if((iwe->u.data.length > descr->max_tokens)
-				&& !(descr->flags & IW_DESCR_FLAG_NOMAX))
-					iwe->u.data.pointer = NULL;	/* Discard paylod */
-
-				/* Same for underflows... */
-				if(iwe->u.data.length < descr->min_tokens)
-					iwe->u.data.pointer = NULL;	/* Discard paylod */
-			}
-		}
-		else
-			/* No data */
-			iwe->u.data.pointer = NULL;
-
-		/* Go to next event */
-		stream->current += iwe->len;
-	}
-	else
-	{
-		/* Ugly fixup for alignement issues.
-		* If the kernel is 64 bits and userspace 32 bits,
-		* we have an extra 4 bytes.
-		* Fixing that in the kernel would break 64 bits userspace. */
-		if((stream->value == NULL)
-		&& ((((iwe->len - IW_EV_LCP_PK_LEN) % event_len) == 4)
-		|| ((iwe->len == 12) && ((event_type == IW_HEADER_TYPE_UINT) ||
-		(event_type == IW_HEADER_TYPE_QUAL))) ))
-		{
-			pointer -= event_len;
-			pointer += 4;
-			/* Beware of alignement. Dest has local alignement, not packed */
-			memcpy((char *) iwe + IW_EV_LCP_LEN, pointer, event_len);
-			pointer += event_len;
-		}
-
-		/* Is there more value in the event ? */
-		if((pointer + event_len) <= (stream->current + iwe->len))
-			/* Go to next value */
-			stream->value = pointer;
-		else
-		{
-			/* Go to next event */
-			stream->value = NULL;
-			stream->current += iwe->len;
-		}
-	}
-
-	return 1;
-}
-
-static inline void wext_fill_wpa(unsigned char *iebuf, int buflen, struct iwinfo_scanlist_entry *e)
-{
-	int ielen = iebuf[1] + 2;
-	int offset = 2; /* Skip the IE id, and the length. */
-	unsigned char wpa1_oui[3] = {0x00, 0x50, 0xf2};
-	unsigned char wpa2_oui[3] = {0x00, 0x0f, 0xac};
-	unsigned char *wpa_oui;
-	int i;
-	uint16_t ver = 0;
-	uint16_t cnt = 0;
-	int wpa1 = 0, wpa2 = 0;
-	char buf[256];
-
-	struct iwinfo_crypto_entry *ce = &e->crypto;
-
-	if(ielen > buflen)
-		ielen = buflen;
-
-	switch(iebuf[0])
-	{
-		case 0x30:      /* WPA2 */
-			/* Check if we have enough data */
-			if(ielen < 4)
-				return;
-
-			wpa_oui = wpa2_oui;
-			break;
-
-		case 0xdd:      /* WPA or else */
-			wpa_oui = wpa1_oui;
-			/* Not all IEs that start with 0xdd are WPA. 
-			*        * So check that the OUI is valid. */
-			if((ielen < 8) || ((memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-				&& (iebuf[offset+3] == 0x01)))
-					return;
-
-			offset += 4;
-			break;
-
-		default:
-			return;
-	}
-
-	/* Pick version number (little endian) */
-	ver = iebuf[offset] | (iebuf[offset + 1] << 8);
-	offset += 2;
-
-	if(iebuf[0] == 0xdd)
-		wpa1 = 1;
-
-	if(iebuf[0] == 0x30)
-		wpa2 = 1;
-
-	if( wpa1 && (ce->wpa_version == 2) )
-		ce->wpa_version = 3;
-	else if( wpa2 && (ce->wpa_version == 1) )
-		ce->wpa_version = 3;
-	else if( wpa1 && !ce->wpa_version )
-		ce->wpa_version = 1;
-	else if( wpa2 && !ce->wpa_version )
-		ce->wpa_version = 2;
-
-	if(ielen < (offset + 4))
-	{
-		ce->group_ciphers |= (1<<2); /* TKIP */
-		ce->pair_ciphers  |= (1<<2); /* TKIP */
-		ce->auth_suites   |= (1<<2); /* PSK */
-		return;
-	}
-
-	if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-		ce->group_ciphers |= (1<<7); /* Proprietary */
-	else
-		ce->group_ciphers |= (1<<iebuf[offset+3]);
-
-	offset += 4;
-
-	if(ielen < (offset + 2))
-	{
-		ce->pair_ciphers |= (1<<2); /* TKIP */
-		ce->auth_suites  |= (1<<2); /* PSK */
-		return;
-	}
-
-	/* Otherwise, we have some number of pairwise ciphers. */
-	cnt = iebuf[offset] | (iebuf[offset + 1] << 8);
-	offset += 2;
-
-	if(ielen < (offset + 4*cnt))
-		return;
-
-	*buf = '\0';
-	for(i = 0; i < cnt; i++)
-	{
-		if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-			ce->pair_ciphers |= (1<<7); /* Proprietary */
-		else if(iebuf[offset+3] <= IW_IE_CYPHER_NUM)
-			ce->pair_ciphers |= (1<<iebuf[offset+3]);
-		//else
-		//	ce->pair_ciphers[ce->pair_cipher_num++] = 255; /* Unknown */
-
-		offset += 4;
-	}
-
-	/* Check if we are done */
-	if(ielen < (offset + 2))
-		return;
-
-	/* Now, we have authentication suites. */
-	cnt = iebuf[offset] | (iebuf[offset + 1] << 8);
-	offset += 2;
-	*buf = '\0';
-
-	if(ielen < (offset + 4*cnt))
-		return;
-
-	for(i = 0; i < cnt; i++)
-	{
-		if(memcmp(&iebuf[offset], wpa_oui, 3) != 0)
-			ce->auth_suites |= (1<<7); /* Proprietary */
-		else if(iebuf[offset+3] <= IW_IE_KEY_MGMT_NUM)
-			ce->auth_suites |= (1<<iebuf[offset+3]);
-		//else
-		//	ce->auth_suites[ce->auth_suite_num++] = 255; /* Unknown */
-
-		offset += 4;
-	}
-}
-
-
-static inline void wext_fill_entry(struct stream_descr *stream, struct iw_event *event,
-	struct iw_range *iw_range, int has_range, struct iwinfo_scanlist_entry *e)
-{
-	int i;
-	double freq;
-
-	/* Now, let's decode the event */
-	switch(event->cmd)
-	{
-		case SIOCGIWAP:
-			memcpy(e->mac, &event->u.ap_addr.sa_data, 6);
-			break;
-
-		case SIOCGIWFREQ:
-			if( event->u.freq.m >= 1000 )
-			{
-				freq = wext_freq2float(&(event->u.freq));
-
-				for(i = 0; i < iw_range->num_frequency; i++)
-				{
-					if( wext_freq2float(&iw_range->freq[i]) == freq )
-					{
-						e->channel = iw_range->freq[i].i;
-						break;
-					}
-				}
-			}
-			else
-			{
-				e->channel = event->u.freq.m;
-			}
-
-			break;
-
-		case SIOCGIWMODE:
-			switch(event->u.mode)
-			{
-				case 1:
-					sprintf((char *) e->mode, "Ad-Hoc");
-					break;
-
-				case 2:
-				case 3:
-					sprintf((char *) e->mode, "Master");
-					break;
-
-				default:
-					sprintf((char *) e->mode, "Unknown");
-			}
-
-			break;
-
-		case SIOCGIWESSID:
-			if( event->u.essid.pointer && event->u.essid.length && event->u.essid.flags )
-				memcpy(e->ssid, event->u.essid.pointer, event->u.essid.length);
-
-			break;
-
-		case SIOCGIWENCODE:
-			e->crypto.enabled = !(event->u.data.flags & IW_ENCODE_DISABLED);
-			break;
-
-		case IWEVQUAL:
-			e->signal = event->u.qual.level;
-			e->quality = event->u.qual.qual;
-			e->quality_max = iw_range->max_qual.qual;
-			break;
-#if 0
-		case SIOCGIWRATE:
-			if(state->val_index == 0)
-			{
-				lua_pushstring(L, "bitrates");
-				lua_newtable(L);
-			}
-			//iw_print_bitrate(buffer, sizeof(buffer), event->u.bitrate.value);
-			snprintf(buffer, sizeof(buffer), "%d", event->u.bitrate.value);
-			lua_pushinteger(L, state->val_index + 1);
-			lua_pushstring(L, buffer);
-			lua_settable(L, -3);
-
-			/* Check for termination */
-			if(stream->value == NULL)
-			{
-				lua_settable(L, -3);
-				state->val_index = 0;
-			} else
-				state->val_index++;
-			break;
-#endif
-		 case IWEVGENIE:
-			i = 0;
-
-			while(i <= (event->u.data.length - 2))
-			{
-				switch(((unsigned char *)event->u.data.pointer)[i])
-				{
-					case 0xdd:  /* WPA1 (and other) */
-					case 0x30:  /* WPA2 */
-						wext_fill_wpa((unsigned char *)event->u.data.pointer + i,
-							event->u.data.length, e);
-
-						break;
-				}
-
-				i += ((unsigned char *)event->u.data.pointer)[i+1] + 2;
-			}
-
-			break;
-	}
-}
-
-
-int wext_get_scanlist(const char *ifname, char *buf, int *len)
-{
-	struct iwreq wrq;
-	struct iw_scan_req scanopt;        /* Options for 'set' */
-	unsigned char *buffer = NULL;      /* Results */
-	int buflen = IW_SCAN_MAX_DATA; /* Min for compat WE<17 */
-	struct iw_range range;
-	int has_range = 1;
-	struct timeval tv;             /* Select timeout */
-	int timeout = 15000000;     /* 15s */
-
-	int entrylen = 0;
-	struct iwinfo_scanlist_entry e;
-
-	wrq.u.data.pointer = (caddr_t) &range;
-	wrq.u.data.length  = sizeof(struct iw_range);
-	wrq.u.data.flags   = 0;	
-
-	if( wext_ioctl(ifname, SIOCGIWRANGE, &wrq) >= 0 )
-	{
-		/* Init timeout value -> 250ms between set and first get */
-		tv.tv_sec  = 0;
-		tv.tv_usec = 250000;
-
-		/* Clean up set args */
-		memset(&scanopt, 0, sizeof(scanopt));
-
-		wrq.u.data.pointer = NULL;
-		wrq.u.data.flags   = 0;
-		wrq.u.data.length  = 0;
-
-		/* Initiate Scanning */
-		if( wext_ioctl(ifname, SIOCSIWSCAN, &wrq) >= 0 )
-		{
-			timeout -= tv.tv_usec;
-
-			/* Forever */
-			while(1)
-			{
-				fd_set rfds;       /* File descriptors for select */
-				int last_fd;    /* Last fd */
-				int ret;
-
-				/* Guess what ? We must re-generate rfds each time */
-				FD_ZERO(&rfds);
-				last_fd = -1;
-				/* In here, add the rtnetlink fd in the list */
-
-				/* Wait until something happens */
-				ret = select(last_fd + 1, &rfds, NULL, NULL, &tv);
-
-				/* Check if there was an error */
-				if(ret < 0)
-				{
-					if(errno == EAGAIN || errno == EINTR)
-						continue;
-
-					return -1;
-				}
-
-				/* Check if there was a timeout */
-				if(ret == 0)
-				{
-					unsigned char *newbuf;
-
-		realloc:
-					/* (Re)allocate the buffer - realloc(NULL, len) == malloc(len) */
-					newbuf = realloc(buffer, buflen);
-					if(newbuf == NULL)
-					{
-						if(buffer)
-							free(buffer);
-
-						return -1;
-					}
-
-					buffer = newbuf;
-
-					/* Try to read the results */
-					wrq.u.data.pointer = buffer;
-					wrq.u.data.flags   = 0;
-					wrq.u.data.length  = buflen;
-
-					if( wext_ioctl(ifname, SIOCGIWSCAN, &wrq) )
-					{
-						/* Check if buffer was too small (WE-17 only) */
-						if((errno == E2BIG) && (range.we_version_compiled > 16))
-						{
-							/* Some driver may return very large scan results, either
-							 * because there are many cells, or because they have many
-							 * large elements in cells (like IWEVCUSTOM). Most will
-							 * only need the regular sized buffer. We now use a dynamic
-							 * allocation of the buffer to satisfy everybody. Of course,
-							 * as we don't know in advance the size of the array, we try
-							 * various increasing sizes. Jean II */
-
-							/* Check if the driver gave us any hints. */
-							if(wrq.u.data.length > buflen)
-								buflen = wrq.u.data.length;
-							else
-								buflen *= 2;
-
-							/* Try again */
-							goto realloc;
-						}
-
-						/* Check if results not available yet */
-						if(errno == EAGAIN)
-						{
-							/* Restart timer for only 100ms*/
-							tv.tv_sec = 0;
-							tv.tv_usec = 100000;
-							timeout -= tv.tv_usec;
-
-							if(timeout > 0)
-								continue;   /* Try again later */
-						}
-
-						/* Bad error */
-						free(buffer);
-						return -1;
-
-					} else {
-						/* We have the results, go to process them */
-						break;
-					}
-				}
-			}
-
-			if( wrq.u.data.length )
-			{
-				struct iw_event       iwe;
-				struct stream_descr   stream;
-				int ret;
-				int first = 1;
-
-				memset(&stream, 0, sizeof(stream));
-				stream.current = (char *)buffer;
-				stream.end     = (char *)buffer + wrq.u.data.length;
-
-				do
-				{
-					/* Extract an event and print it */
-					ret = wext_extract_event(&stream, &iwe, range.we_version_compiled);
-
-					if(ret >= 0)
-					{
-						if( (iwe.cmd == SIOCGIWAP) || (ret == 0) )
-						{
-							if( first )
-							{
-								first = 0;
-							}
-							else if( (entrylen + sizeof(struct iwinfo_scanlist_entry)) <= IWINFO_BUFSIZE )
-							{
-								/* if encryption is off, clear the crypto strunct */
-								if( !e.crypto.enabled )
-									memset(&e.crypto, 0, sizeof(struct iwinfo_crypto_entry));
-
-								memcpy(&buf[entrylen], &e, sizeof(struct iwinfo_scanlist_entry));
-								entrylen += sizeof(struct iwinfo_scanlist_entry);
-							}
-							else
-							{
-								/* we exceed the callers buffer size, abort here ... */
-								break;
-							}
-
-							memset(&e, 0, sizeof(struct iwinfo_scanlist_entry));
-						}
-
-						wext_fill_entry(&stream, &iwe, &range, has_range, &e);
-					}
-
-				} while(ret > 0);
-
-				free(buffer);
-				*len = entrylen;
-				return 0;
-			}
-
-			free(buffer);
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
diff --git a/libs/iwinfo/src/iwinfo_wext_scan.h b/libs/iwinfo/src/iwinfo_wext_scan.h
deleted file mode 100644
index a85f563f6a..0000000000
--- a/libs/iwinfo/src/iwinfo_wext_scan.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Headers
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#ifndef __IWINFO_WEXT_SCAN_H_
-#define __IWINFO_WEXT_SCAN_H_
-
-#include "iwinfo.h"
-#include "include/wext.h"
-
-
-typedef struct stream_descr
-{
-  char *        end;            /* End of the stream */
-  char *        current;        /* Current event in stream of events */
-  char *        value;          /* Current value in event */
-} stream_descr;
-
-/*
- * Describe how a standard IOCTL looks like.
- */
-struct iw_ioctl_description
-{
-	uint8_t	header_type;		/* NULL, iw_point or other */
-	uint8_t	token_type;		/* Future */
-	uint16_t	token_size;		/* Granularity of payload */
-	uint16_t	min_tokens;		/* Min acceptable token number */
-	uint16_t	max_tokens;		/* Max acceptable token number */
-	uint32_t	flags;			/* Special handling of the request */
-};
-
-/* Type of headers we know about (basically union iwreq_data) */
-#define IW_HEADER_TYPE_NULL	0	/* Not available */
-#define IW_HEADER_TYPE_CHAR	2	/* char [IFNAMSIZ] */
-#define IW_HEADER_TYPE_UINT	4	/* __u32 */
-#define IW_HEADER_TYPE_FREQ	5	/* struct iw_freq */
-#define IW_HEADER_TYPE_ADDR	6	/* struct sockaddr */
-#define IW_HEADER_TYPE_POINT	8	/* struct iw_point */
-#define IW_HEADER_TYPE_PARAM	9	/* struct iw_param */
-#define IW_HEADER_TYPE_QUAL	10	/* struct iw_quality */
-
-/* Handling flags */
-/* Most are not implemented. I just use them as a reminder of some
- * cool features we might need one day ;-) */
-#define IW_DESCR_FLAG_NONE	0x0000	/* Obvious */
-/* Wrapper level flags */
-#define IW_DESCR_FLAG_DUMP	0x0001	/* Not part of the dump command */
-#define IW_DESCR_FLAG_EVENT	0x0002	/* Generate an event on SET */
-#define IW_DESCR_FLAG_RESTRICT	0x0004	/* GET : request is ROOT only */
-				/* SET : Omit payload from generated iwevent */
-#define IW_DESCR_FLAG_NOMAX	0x0008	/* GET : no limit on request size */
-/* Driver level flags */
-#define IW_DESCR_FLAG_WAIT	0x0100	/* Wait for driver event */
-
-
-/*
- * Meta-data about all the standard Wireless Extension request we
- * know about.
- */
-static const struct iw_ioctl_description standard_ioctl_descr[] = {
-	[SIOCSIWCOMMIT	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_NULL,
-	},
-	[SIOCGIWNAME	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_CHAR,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWNWID	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-		.flags		= IW_DESCR_FLAG_EVENT,
-	},
-	[SIOCGIWNWID	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWFREQ	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_FREQ,
-		.flags		= IW_DESCR_FLAG_EVENT,
-	},
-	[SIOCGIWFREQ	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_FREQ,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWMODE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_UINT,
-		.flags		= IW_DESCR_FLAG_EVENT,
-	},
-	[SIOCGIWMODE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_UINT,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWSENS	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWSENS	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWRANGE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_NULL,
-	},
-	[SIOCGIWRANGE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= sizeof(struct iw_range),
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWPRIV	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_NULL,
-	},
-	[SIOCGIWPRIV	- SIOCIWFIRST] = { /* (handled directly by us) */
-		.header_type	= IW_HEADER_TYPE_NULL,
-	},
-	[SIOCSIWSTATS	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_NULL,
-	},
-	[SIOCGIWSTATS	- SIOCIWFIRST] = { /* (handled directly by us) */
-		.header_type	= IW_HEADER_TYPE_NULL,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWSPY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= sizeof(struct sockaddr),
-		.max_tokens	= IW_MAX_SPY,
-	},
-	[SIOCGIWSPY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= sizeof(struct sockaddr) +
-				  sizeof(struct iw_quality),
-		.max_tokens	= IW_MAX_SPY,
-	},
-	[SIOCSIWTHRSPY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= sizeof(struct iw_thrspy),
-		.min_tokens	= 1,
-		.max_tokens	= 1,
-	},
-	[SIOCGIWTHRSPY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= sizeof(struct iw_thrspy),
-		.min_tokens	= 1,
-		.max_tokens	= 1,
-	},
-	[SIOCSIWAP	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_ADDR,
-	},
-	[SIOCGIWAP	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_ADDR,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWMLME	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.min_tokens	= sizeof(struct iw_mlme),
-		.max_tokens	= sizeof(struct iw_mlme),
-	},
-	[SIOCGIWAPLIST	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= sizeof(struct sockaddr) +
-				  sizeof(struct iw_quality),
-		.max_tokens	= IW_MAX_AP,
-		.flags		= IW_DESCR_FLAG_NOMAX,
-	},
-	[SIOCSIWSCAN	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.min_tokens	= 0,
-		.max_tokens	= sizeof(struct iw_scan_req),
-	},
-	[SIOCGIWSCAN	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_SCAN_MAX_DATA,
-		.flags		= IW_DESCR_FLAG_NOMAX,
-	},
-	[SIOCSIWESSID	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
-		.flags		= IW_DESCR_FLAG_EVENT,
-	},
-	[SIOCGIWESSID	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
-		.flags		= IW_DESCR_FLAG_DUMP,
-	},
-	[SIOCSIWNICKN	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
-	},
-	[SIOCGIWNICKN	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
-	},
-	[SIOCSIWRATE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWRATE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWRTS	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWRTS	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWFRAG	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWFRAG	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWTXPOW	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWTXPOW	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWRETRY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWRETRY	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWENCODE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ENCODING_TOKEN_MAX,
-		.flags		= IW_DESCR_FLAG_EVENT | IW_DESCR_FLAG_RESTRICT,
-	},
-	[SIOCGIWENCODE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_ENCODING_TOKEN_MAX,
-		.flags		= IW_DESCR_FLAG_DUMP | IW_DESCR_FLAG_RESTRICT,
-	},
-	[SIOCSIWPOWER	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWPOWER	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWMODUL	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWMODUL	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWGENIE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_GENERIC_IE_MAX,
-	},
-	[SIOCGIWGENIE	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_GENERIC_IE_MAX,
-	},
-	[SIOCSIWAUTH	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCGIWAUTH	- SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_PARAM,
-	},
-	[SIOCSIWENCODEEXT - SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.min_tokens	= sizeof(struct iw_encode_ext),
-		.max_tokens	= sizeof(struct iw_encode_ext) +
-				  IW_ENCODING_TOKEN_MAX,
-	},
-	[SIOCGIWENCODEEXT - SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.min_tokens	= sizeof(struct iw_encode_ext),
-		.max_tokens	= sizeof(struct iw_encode_ext) +
-				  IW_ENCODING_TOKEN_MAX,
-	},
-	[SIOCSIWPMKSA - SIOCIWFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.min_tokens	= sizeof(struct iw_pmksa),
-		.max_tokens	= sizeof(struct iw_pmksa),
-	},
-};
-
-/*
- * Meta-data about all the additional standard Wireless Extension events
- * we know about.
- */
-static const struct iw_ioctl_description standard_event_descr[] = {
-	[IWEVTXDROP	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_ADDR,
-	},
-	[IWEVQUAL	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_QUAL,
-	},
-	[IWEVCUSTOM	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_CUSTOM_MAX,
-	},
-	[IWEVREGISTERED	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_ADDR,
-	},
-	[IWEVEXPIRED	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_ADDR, 
-	},
-	[IWEVGENIE	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_GENERIC_IE_MAX,
-	},
-	[IWEVMICHAELMICFAILURE	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT, 
-		.token_size	= 1,
-		.max_tokens	= sizeof(struct iw_michaelmicfailure),
-	},
-	[IWEVASSOCREQIE	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_GENERIC_IE_MAX,
-	},
-	[IWEVASSOCRESPIE	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= IW_GENERIC_IE_MAX,
-	},
-	[IWEVPMKIDCAND	- IWEVFIRST] = {
-		.header_type	= IW_HEADER_TYPE_POINT,
-		.token_size	= 1,
-		.max_tokens	= sizeof(struct iw_pmkid_cand),
-	},
-};
-
-/* Size (in bytes) of various events */
-static const int event_type_size[] = {
-	IW_EV_LCP_PK_LEN,	/* IW_HEADER_TYPE_NULL */
-	0,
-	IW_EV_CHAR_PK_LEN,	/* IW_HEADER_TYPE_CHAR */
-	0,
-	IW_EV_UINT_PK_LEN,	/* IW_HEADER_TYPE_UINT */
-	IW_EV_FREQ_PK_LEN,	/* IW_HEADER_TYPE_FREQ */
-	IW_EV_ADDR_PK_LEN,	/* IW_HEADER_TYPE_ADDR */
-	0,
-	IW_EV_POINT_PK_LEN,	/* Without variable payload */
-	IW_EV_PARAM_PK_LEN,	/* IW_HEADER_TYPE_PARAM */
-	IW_EV_QUAL_PK_LEN,	/* IW_HEADER_TYPE_QUAL */
-};
-
-
-static const unsigned int standard_ioctl_num =
-	(sizeof(standard_ioctl_descr) / sizeof(struct iw_ioctl_description));
-
-static const unsigned int standard_event_num =
-	(sizeof(standard_event_descr) / sizeof(struct iw_ioctl_description));
-
-static const char *iw_ie_cypher_name[] = {
-	"none",
-	"WEP-40",
-	"TKIP",
-	"WRAP",
-	"CCMP",
-	"WEP-104",
-};
-
-#define IW_ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))
-#define	IW_IE_CYPHER_NUM	IW_ARRAY_LEN(iw_ie_cypher_name)
-
-static const char *iw_ie_key_mgmt_name[] = {
-	"none",
-	"802.1x",
-	"PSK",
-};
-#define	IW_IE_KEY_MGMT_NUM	IW_ARRAY_LEN(iw_ie_key_mgmt_name)
-
-#endif
diff --git a/libs/iwinfo/src/iwinfo_wl.c b/libs/iwinfo/src/iwinfo_wl.c
deleted file mode 100644
index f8ee4f3e32..0000000000
--- a/libs/iwinfo/src/iwinfo_wl.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Broadcom wl.o Backend
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- *
- * This code is based on the wlc.c utility published by OpenWrt.org . 
- */
-
-#include "iwinfo_wl.h"
-#include "iwinfo_wext.h"
-
-static int ioctl_socket = -1;
-
-static int wl_ioctl(const char *name, int cmd, void *buf, int len)
-{
-	struct ifreq ifr;
-	wl_ioctl_t ioc;
-
-	/* prepare socket */
-	if( ioctl_socket == -1 )
-		ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
-
-	/* do it */
-	ioc.cmd = cmd;
-	ioc.buf = buf;
-	ioc.len = len;
-	strncpy(ifr.ifr_name, name, IFNAMSIZ);
-	ifr.ifr_data = (caddr_t) &ioc;
-
-	return ioctl(ioctl_socket, SIOCDEVPRIVATE, &ifr);
-}
-
-static struct wl_maclist * wl_read_assoclist(const char *ifname)
-{
-	struct wl_maclist *macs;
-	int maclen = 4 + WL_MAX_STA_COUNT * 6;
-
-	if( (macs = (struct wl_maclist *) malloc(maclen)) != NULL )
-	{
-		memset(macs, 0, maclen);
-		macs->count = WL_MAX_STA_COUNT;
-
-		if( !wl_ioctl(ifname, WLC_GET_ASSOCLIST, macs, maclen) )
-			return macs;
-
-		free(macs);
-	}
-
-	return NULL;
-}
-
-
-int wl_probe(const char *ifname)
-{
-	int magic;
-
-	if( !wl_ioctl(ifname, WLC_GET_MAGIC, &magic, sizeof(magic)) && (magic == WLC_IOCTL_MAGIC))
-		return 1;
-
-	return 0;
-}
-
-int wl_get_mode(const char *ifname, char *buf)
-{
-	int ret = -1;
-	int ap, infra, passive;
-
-	if( (ret = wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap))) )
-		return ret;
-
-	if( (ret = wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra))) )
-		return ret;
-
-	if( (ret = wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive))) )
-		return ret;
-
-	if( passive )
-		sprintf(buf, "Monitor");
-	else if( !infra )
-		sprintf(buf, "Ad-Hoc");
-	else if( ap )
-		sprintf(buf, "Master");
-	else
-		sprintf(buf, "Client");
-
-	return 0;
-}
-
-int wl_get_ssid(const char *ifname, char *buf)
-{
-	int ret = -1;
-	wlc_ssid_t ssid;
-
-	if( !(ret = wl_ioctl(ifname, WLC_GET_SSID, &ssid, sizeof(ssid))) )
-		memcpy(buf, ssid.ssid, ssid.ssid_len);
-
-	return ret;
-}
-
-int wl_get_bssid(const char *ifname, char *buf)
-{
-	int ret = -1;
-	char bssid[6];
-
-	if( !(ret = wl_ioctl(ifname, WLC_GET_BSSID, bssid, 6)) )
-		sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
-			(uint8_t)bssid[0], (uint8_t)bssid[1], (uint8_t)bssid[2],
-			(uint8_t)bssid[3], (uint8_t)bssid[4], (uint8_t)bssid[5]
-		);
-
-	return ret;
-}
-
-int wl_get_channel(const char *ifname, int *buf)
-{
-	return wl_ioctl(ifname, WLC_GET_CHANNEL, buf, sizeof(buf));
-}
-
-int wl_get_frequency(const char *ifname, int *buf)
-{
-	return wext_get_frequency(ifname, buf);
-}
-
-int wl_get_bitrate(const char *ifname, int *buf)
-{
-	int ret = -1;
-	int rate = 0;
-
-	if( !(ret = wl_ioctl(ifname, WLC_GET_RATE, &rate, sizeof(rate))) && (rate > 0))
-		*buf = ((rate / 2) * 1000) + ((rate & 1) ? 500 : 0);
-
-	return ret;
-}
-
-int wl_get_signal(const char *ifname, int *buf)
-{
-	unsigned int ap, rssi, i, rssi_count;
-	int ioctl_req_version = 0x2000;
-	char tmp[WLC_IOCTL_MAXLEN];
-	struct wl_maclist *macs = NULL;
-	wl_sta_rssi_t starssi;
-
-	memset(tmp, 0, WLC_IOCTL_MAXLEN);
-	memcpy(tmp, &ioctl_req_version, sizeof(ioctl_req_version));
-
-	wl_ioctl(ifname, WLC_GET_BSS_INFO, tmp, WLC_IOCTL_MAXLEN);
-
-	if( !wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap)) && !ap )
-	{
-		*buf = tmp[WL_BSS_RSSI_OFFSET];
-	}
-	else
-	{
-		rssi = rssi_count = 0;
-
-		/* Calculate average rssi from conntected stations */
-		if( (macs = wl_read_assoclist(ifname)) != NULL )
-		{
-			for( i = 0; i < macs->count; i++ )
-			{
-				memcpy(starssi.mac, &macs->ea[i], 6);
-
-				if( !wl_ioctl(ifname, WLC_GET_RSSI, &starssi, 12) )
-				{
-					rssi -= starssi.rssi;
-					rssi_count++;
-				}
-			}
-
-			free(macs);
-		}
-
-		*buf = (rssi == 0 || rssi_count == 0) ? 1 : -(rssi / rssi_count);
-	}
-
-	return 0;
-}
-
-int wl_get_noise(const char *ifname, int *buf)
-{
-	unsigned int ap, noise;
-	int ioctl_req_version = 0x2000;
-	char tmp[WLC_IOCTL_MAXLEN];
-
-	memset(tmp, 0, WLC_IOCTL_MAXLEN);
-	memcpy(tmp, &ioctl_req_version, sizeof(ioctl_req_version));
-
-	wl_ioctl(ifname, WLC_GET_BSS_INFO, tmp, WLC_IOCTL_MAXLEN);
-
-	if ((wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap)) < 0) || ap)
-	{
-		if (wl_ioctl(ifname, WLC_GET_PHY_NOISE, &noise, sizeof(noise)) < 0)
-			noise = 0;
-	}
-	else
-	{
-		noise = tmp[WL_BSS_NOISE_OFFSET];
-	}
-
-	*buf = noise;
-
-	return 0;
-}
-
-int wl_get_quality(const char *ifname, int *buf)
-{
-	return wext_get_quality(ifname, buf);
-}
-
-int wl_get_quality_max(const char *ifname, int *buf)
-{
-	return wext_get_quality_max(ifname, buf);
-}
-
-int wl_get_enctype(const char *ifname, char *buf)
-{
-	uint32_t wsec, wpa;
-	char algo[9];
-
-	if( wl_ioctl(ifname, WLC_GET_WPA_AUTH, &wpa, sizeof(uint32_t)) ||
-	    wl_ioctl(ifname, WLC_GET_WSEC, &wsec, sizeof(uint32_t)) )
-			return -1;
-
-	switch(wsec)
-	{
-		case 2:
-			sprintf(algo, "TKIP");
-			break;
-
-		case 4:
-			sprintf(algo, "CCMP");
-			break;
-
-		case 6:
-			sprintf(algo, "TKIP, CCMP");
-			break;
-	}
-
-	switch(wpa)
-	{
-		case 0:
-			sprintf(buf, "%s", wsec ? "WEP" : "None");
-			break;
-
-		case 2:
-			sprintf(buf, "WPA 802.1X (%s)", algo);
-			break;
-
-		case 4:
-			sprintf(buf, "WPA PSK (%s)", algo);
-			break;
-
-		case 32:
-			sprintf(buf, "802.1X (%s)", algo);
-			break;
-
-		case 64:
-			sprintf(buf, "WPA2 802.1X (%s)", algo);
-			break;
-
-		case 66:
-			sprintf(buf, "mixed WPA/WPA2 802.1X (%s)", algo);
-			break;
-
-		case 128:
-			sprintf(buf, "WPA2 PSK (%s)", algo);
-			break;
-
-		case 132:
-			sprintf(buf, "mixed WPA/WPA2 PSK (%s)", algo);
-			break;
-
-		default:
-			sprintf(buf, "Unkown");
-	}
-
-	return 0;
-}
-
-int wl_get_assoclist(const char *ifname, char *buf, int *len)
-{
-	int i, j, noise;
-	int ap, infra, passive;
-	char line[128];
-	char macstr[18];
-	char devstr[IFNAMSIZ];
-	struct wl_maclist *macs;
-	struct wl_sta_rssi rssi;
-	struct iwinfo_assoclist_entry entry;
-	FILE *arp;
-
-	ap = infra = passive = 0;
-
-	wl_ioctl(ifname, WLC_GET_AP, &ap, sizeof(ap));
-	wl_ioctl(ifname, WLC_GET_INFRA, &infra, sizeof(infra));
-	wl_ioctl(ifname, WLC_GET_PASSIVE, &passive, sizeof(passive));
-
-	if( wl_get_noise(ifname, &noise) )
-		noise = 0;
-
-	if( (ap || infra || passive) && ((macs = wl_read_assoclist(ifname)) != NULL) )
-	{
-		for( i = 0, j = 0; i < macs->count; i++, j += sizeof(struct iwinfo_assoclist_entry) )
-		{
-			memcpy(rssi.mac, &macs->ea[i], 6);
-
-			if( !wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)) )
-				entry.signal = (rssi.rssi - 0x100);
-			else
-				entry.signal = 0;
-
-			entry.noise = noise;
-			memcpy(entry.mac, &macs->ea[i], 6);
-			memcpy(&buf[j], &entry, sizeof(entry));
-		}
-
-		*len = j;
-		free(macs);
-		return 0;
-	}
-	else if( (arp = fopen("/proc/net/arp", "r")) != NULL )
-	{
-		j = 0;
-
-		while( fgets(line, sizeof(line), arp) != NULL )
-		{
-			if( sscanf(line, "%*s 0x%*d 0x%*d %17s %*s %s", macstr, devstr) && !strcmp(devstr, ifname) )
-			{
-				rssi.mac[0] = strtol(&macstr[0],  NULL, 16);
-				rssi.mac[1] = strtol(&macstr[3],  NULL, 16);
-				rssi.mac[2] = strtol(&macstr[6],  NULL, 16);
-				rssi.mac[3] = strtol(&macstr[9],  NULL, 16);
-				rssi.mac[4] = strtol(&macstr[12], NULL, 16);
-				rssi.mac[5] = strtol(&macstr[15], NULL, 16);
-
-				if( !wl_ioctl(ifname, WLC_GET_RSSI, &rssi, sizeof(struct wl_sta_rssi)) )
-					entry.signal = (rssi.rssi - 0x100);
-				else
-					entry.signal = 0;
-
-				entry.noise = noise;
-				memcpy(entry.mac, rssi.mac, 6);
-				memcpy(&buf[j], &entry, sizeof(entry));
-
-				j += sizeof(entry);
-			}
-		}
-
-		*len = j;
-		(void) fclose(arp);
-		return 0;
-	}
-
-	return -1;
-}
-
-int wl_get_txpwrlist(const char *ifname, char *buf, int *len)
-{
-	struct iwinfo_txpwrlist_entry entry;
-	uint8_t dbm[8] = { 0, 6, 8, 10, 12, 14, 16, 18 };
-	uint8_t mw[8]  = { 1, 3, 6, 10, 15, 25, 39, 63 };
-	int i;
-
-	for( i = 0; i < 8; i++ )
-	{
-		entry.dbm = dbm[i];
-		entry.mw  = mw[i];
-		memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
-	}
-
-	*len = 8 * sizeof(entry);
-	return 0;
-}
-
-int wl_get_scanlist(const char *ifname, char *buf, int *len)
-{
-	return wext_get_scanlist(ifname, buf, len);
-}
-
-int wl_get_freqlist(const char *ifname, char *buf, int *len)
-{
-	return wext_get_freqlist(ifname, buf, len);
-}
-
-int wl_get_mbssid_support(const char *ifname, int *buf)
-{
-	wlc_rev_info_t revinfo;
-
-	/* Multi bssid support only works on corerev >= 9 */
-	if( !wl_ioctl(ifname, WLC_GET_REVINFO, &revinfo, sizeof(revinfo)) )
-	{
-		if( revinfo.corerev >= 9 )
-		{
-			*buf = 1;
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
diff --git a/libs/iwinfo/src/iwinfo_wl.h b/libs/iwinfo/src/iwinfo_wl.h
deleted file mode 100644
index 2892715cd5..0000000000
--- a/libs/iwinfo/src/iwinfo_wl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Broadcom wl.o Headers
- *
- *   Copyright (C) 2009 Jo-Philipp Wich <xm@subsignal.org>
- *
- * The iwinfo library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * The iwinfo library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the iwinfo library. If not, see http://www.gnu.org/licenses/.
- */
-
-#ifndef __IWINFO_WL_H_
-#define __IWINFO_WL_H_
-
-#include "iwinfo.h"
-#include "include/broadcom.h"
-
-int wl_probe(const char *ifname);
-int wl_get_mode(const char *ifname, char *buf);
-int wl_get_ssid(const char *ifname, char *buf);
-int wl_get_bssid(const char *ifname, char *buf);
-int wl_get_channel(const char *ifname, int *buf);
-int wl_get_frequency(const char *ifname, int *buf);
-int wl_get_bitrate(const char *ifname, int *buf);
-int wl_get_signal(const char *ifname, int *buf);
-int wl_get_noise(const char *ifname, int *buf);
-int wl_get_quality(const char *ifname, int *buf);
-int wl_get_quality_max(const char *ifname, int *buf);
-int wl_get_enctype(const char *ifname, char *buf);
-int wl_get_assoclist(const char *ifname, char *buf, int *len);
-int wl_get_txpwrlist(const char *ifname, char *buf, int *len);
-int wl_get_scanlist(const char *ifname, char *buf, int *len);
-int wl_get_freqlist(const char *ifname, char *buf, int *len);
-int wl_get_mbssid_support(const char *ifname, int *buf);
-
-#endif
diff --git a/libs/iwinfo/standalone.mk b/libs/iwinfo/standalone.mk
deleted file mode 100644
index 66a0e5a2e7..0000000000
--- a/libs/iwinfo/standalone.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-LUAC = luac
-LUAC_OPTIONS = -s
-LUA_TARGET ?= source
-
-LUA_MODULEDIR = /usr/local/share/lua/5.1
-LUA_LIBRARYDIR = /usr/local/lib/lua/5.1
-
-OS ?= $(shell uname)
-
-LUA_SHLIBS = $(shell pkg-config --silence-errors --libs lua5.1 || pkg-config --silence-errors --libs lua-5.1 || pkg-config --silence-errors --libs lua)
-LUA_LIBS = $(if $(LUA_SHLIBS),$(LUA_SHLIBS),$(firstword $(wildcard /usr/lib/liblua.a /usr/local/lib/liblua.a /opt/local/lib/liblua.a)))
-LUA_CFLAGS = $(shell pkg-config --silence-errors --cflags lua5.1 || pkg-config --silence-errors --cflags lua-5.1 || pkg-config --silence-errors --cflags lua)
-
-CC = gcc
-AR = ar
-RANLIB = ranlib
-CFLAGS = -O2
-FPIC = -fPIC
-EXTRA_CFLAGS = --std=gnu99
-WFLAGS = -Wall -Werror -pedantic
-CPPFLAGS =
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-ifeq ($(OS),Darwin)
-  SHLIB_FLAGS = -bundle -undefined dynamic_lookup
-else
-  SHLIB_FLAGS = -shared
-endif
-LINK = $(CC) $(LDFLAGS)
-
-.PHONY: all build compile luacompile luasource clean luaclean
-
-all: build
-
-build: luabuild gccbuild
-
-luabuild: lua$(LUA_TARGET)
-
-gccbuild: compile
-compile:
-
-clean: luaclean
-
-luasource:
-	mkdir -p dist$(LUA_MODULEDIR)
-	cp -pR root/* dist 2>/dev/null || true
-	cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true
-	for i in $$(find dist -name .svn); do rm -rf $$i || true; done
-
-luastrip: luasource
-	for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done
-
-luacompile: luasource
-	for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done
-
-luaclean:
-	rm -rf dist