contrib: drop libiwinfo, moved to OpenWrt trunk

25 files changed, 0 insertions, 11058 deletions

diff --git a/contrib/package/iwinfo/Makefile b/contrib/package/iwinfo/Makefile
deleted file mode 100644
index a89bd1447..000000000
--- a/contrib/package/iwinfo/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
-#
-# This is free software, licensed under the GPL 2 license.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libiwinfo
-PKG_RELEASE:=18
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libiwinfo
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Generalized Wireless Information Library (iwinfo)
-  DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny
-endef
-
-define Package/libiwinfo/description
-  Wireless information library with consistent interface for proprietary Broadcom,
-  madwifi, nl80211 and wext driver interfaces.
-endef
-
-
-define Package/libiwinfo-lua
-  SUBMENU:=Lua
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=libiwinfo Lua binding
-  DEPENDS:=+libiwinfo +liblua +lua
-endef
-
-define Package/libiwinfo-lua/description
-  This is the Lua binding for the iwinfo library. It provides access to all enabled
-  backends.
-endef
-
-
-define Package/iwinfo
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Generalized Wireless Information utility
-  DEPENDS:=+libiwinfo
-endef
-
-define Package/iwinfo/description
-  Command line frontend for the wireless information library.
-endef
-
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Configure
-endef
-
-IWINFO_BACKENDS := \
-	$(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \
-	$(if $(CONFIG_PACKAGE_kmod-brcm-wl-mini),wl) \
-	$(if $(CONFIG_PACKAGE_kmod-brcm-wl-mimo),wl) \
-	$(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \
-	$(if $(CONFIG_PACKAGE_kmod-mac80211),nl80211)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include/libnl-tiny \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	FPIC="$(FPIC)" \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	BACKENDS="$(IWINFO_BACKENDS)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/iwinfo
-	$(CP) $(PKG_BUILD_DIR)/include/iwinfo.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/include/iwinfo/* $(1)/usr/include/iwinfo/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
-endef
-
-define Package/libiwinfo/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so
-endef
-
-define Package/libiwinfo-lua/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so
-endef
-
-define Package/iwinfo/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo $(1)/usr/bin/iwinfo
-endef
-
-$(eval $(call BuildPackage,libiwinfo))
-$(eval $(call BuildPackage,libiwinfo-lua))
-$(eval $(call BuildPackage,iwinfo))
diff --git a/contrib/package/iwinfo/src/COPYING b/contrib/package/iwinfo/src/COPYING
deleted file mode 100644
index d511905c1..000000000
--- a/contrib/package/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/contrib/package/iwinfo/src/Makefile b/contrib/package/iwinfo/src/Makefile
deleted file mode 100644
index 572bef9f9..000000000
--- a/contrib/package/iwinfo/src/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-IWINFO_BACKENDS    = $(BACKENDS)
-IWINFO_CFLAGS      = $(CFLAGS) -std=gnu99 -fstrict-aliasing -Iinclude
-
-IWINFO_LIB         = libiwinfo.so
-IWINFO_LIB_LDFLAGS = $(LDFLAGS) -shared
-IWINFO_LIB_OBJ     = iwinfo_utils.o iwinfo_wext.o iwinfo_wext_scan.o iwinfo_lib.o
-
-IWINFO_LUA         = iwinfo.so
-IWINFO_LUA_LDFLAGS = $(LDFLAGS) -shared -L. -liwinfo -llua
-IWINFO_LUA_OBJ     = iwinfo_lua.o
-
-IWINFO_CLI         = iwinfo
-IWINFO_CLI_LDFLAGS = $(LDFLAGS) -L. -liwinfo
-IWINFO_CLI_OBJ     = iwinfo_cli.o
-
-
-ifneq ($(filter wl,$(IWINFO_BACKENDS)),)
-	IWINFO_CFLAGS  += -DUSE_WL
-	IWINFO_LIB_OBJ += iwinfo_wl.o
-endif
-
-ifneq ($(filter madwifi,$(IWINFO_BACKENDS)),)
-	IWINFO_CFLAGS  += -DUSE_MADWIFI
-	IWINFO_LIB_OBJ += iwinfo_madwifi.o
-endif
-
-ifneq ($(filter nl80211,$(IWINFO_BACKENDS)),)
-	IWINFO_CFLAGS      += -DUSE_NL80211
-	IWINFO_CLI_LDFLAGS += -lnl-tiny
-	IWINFO_LIB_LDFLAGS += -lnl-tiny
-	IWINFO_LIB_OBJ     += iwinfo_nl80211.o
-endif
-
-
-%.o: %.c
-	$(CC) $(IWINFO_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: clean $(IWINFO_LIB_OBJ) $(IWINFO_LUA_OBJ) $(IWINFO_CLI_OBJ)
-	$(CC) $(IWINFO_LIB_LDFLAGS) -o $(IWINFO_LIB) $(IWINFO_LIB_OBJ)
-	$(CC) $(IWINFO_LUA_LDFLAGS) -o $(IWINFO_LUA) $(IWINFO_LUA_OBJ)
-	$(CC) $(IWINFO_CLI_LDFLAGS) -o $(IWINFO_CLI) $(IWINFO_CLI_OBJ)
-
-clean:
-	rm -f *.o $(IWINFO_LIB) $(IWINFO_LUA) $(IWINFO_CLI)
diff --git a/contrib/package/iwinfo/src/dummy.lua b/contrib/package/iwinfo/src/dummy.lua
deleted file mode 100644
index b2a3c1aa7..000000000
--- a/contrib/package/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/contrib/package/iwinfo/src/include/iwinfo.h b/contrib/package/iwinfo/src/include/iwinfo.h
deleted file mode 100644
index 824b94536..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo.h
+++ /dev/null
@@ -1,143 +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>
-
-
-#define IWINFO_BUFSIZE	24 * 1024
-#define IWINFO_ESSID_MAX_SIZE	32
-
-#define IWINFO_80211_A       (1 << 0)
-#define IWINFO_80211_B       (1 << 1)
-#define IWINFO_80211_G       (1 << 2)
-#define IWINFO_80211_N       (1 << 3)
-
-#define IWINFO_CIPHER_NONE   (1 << 0)
-#define IWINFO_CIPHER_WEP40  (1 << 1)
-#define IWINFO_CIPHER_TKIP   (1 << 2)
-#define IWINFO_CIPHER_WRAP   (1 << 3)
-#define IWINFO_CIPHER_CCMP   (1 << 4)
-#define IWINFO_CIPHER_WEP104 (1 << 5)
-#define IWINFO_CIPHER_AESOCB (1 << 6)
-#define IWINFO_CIPHER_CKIP   (1 << 7)
-
-#define IWINFO_KMGMT_NONE    (1 << 0)
-#define IWINFO_KMGMT_8021x   (1 << 1)
-#define IWINFO_KMGMT_PSK     (1 << 2)
-
-#define IWINFO_AUTH_OPEN     (1 << 0)
-#define IWINFO_AUTH_SHARED   (1 << 1)
-
-extern const char *IWINFO_CIPHER_NAMES[];
-extern const char *IWINFO_KMGMT_NAMES[];
-extern const char *IWINFO_AUTH_NAMES[];
-
-
-struct iwinfo_assoclist_entry {
-	uint8_t	mac[6];
-	int8_t signal;
-	int8_t noise;
-};
-
-struct iwinfo_txpwrlist_entry {
-	uint8_t  dbm;
-	uint16_t mw;
-};
-
-struct iwinfo_freqlist_entry {
-	uint8_t channel;
-	uint32_t mhz;
-	uint8_t restricted;
-};
-
-struct iwinfo_crypto_entry {
-	uint8_t	enabled;
-	uint8_t wpa_version;
-	uint8_t group_ciphers;
-	uint8_t pair_ciphers;
-	uint8_t auth_suites;
-	uint8_t auth_algs;
-};
-
-struct iwinfo_scanlist_entry {
-	uint8_t mac[6];
-	uint8_t ssid[IWINFO_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;
-};
-
-struct iwinfo_country_entry {
-	uint16_t iso3166;
-	uint8_t ccode[4];
-};
-
-struct iwinfo_iso3166_label {
-	uint16_t iso3166;
-	uint8_t  name[28];
-};
-
-extern const struct iwinfo_iso3166_label IWINFO_ISO3166_NAMES[];
-
-
-struct iwinfo_ops {
-	int (*channel)(const char *, int *);
-	int (*frequency)(const char *, int *);
-	int (*txpower)(const char *, int *);
-	int (*bitrate)(const char *, int *);
-	int (*signal)(const char *, int *);
-	int (*noise)(const char *, int *);
-	int (*quality)(const char *, int *);
-	int (*quality_max)(const char *, int *);
-	int (*mbssid_support)(const char *, int *);
-	int (*hwmodelist)(const char *, int *);
-	int (*mode)(const char *, char *);
-	int (*ssid)(const char *, char *);
-	int (*bssid)(const char *, char *);
-	int (*country)(const char *, char *);
-	int (*encryption)(const char *, char *);
-	int (*assoclist)(const char *, char *, int *);
-	int (*txpwrlist)(const char *, char *, int *);
-	int (*scanlist)(const char *, char *, int *);
-	int (*freqlist)(const char *, char *, int *);
-	int (*countrylist)(const char *, char *, int *);
-	void (*close)(void);
-};
-
-const char * iwinfo_type(const char *ifname);
-const struct iwinfo_ops * iwinfo_backend(const char *ifname);
-void iwinfo_finish(void);
-
-#include "iwinfo/wext.h"
-
-#ifdef USE_WL
-#include "iwinfo/wl.h"
-#endif
-
-#ifdef USE_MADWIFI
-#include "iwinfo/madwifi.h"
-#endif
-
-#ifdef USE_NL80211
-#include "iwinfo/nl80211.h"
-#endif
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/api/broadcom.h b/contrib/package/iwinfo/src/include/iwinfo/api/broadcom.h
deleted file mode 100644
index bae69c7f7..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/api/broadcom.h
+++ /dev/null
@@ -1,107 +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_CNTRY_BUF_SZ        	4
-
-#define WLC_GET_MAGIC				0
-#define WLC_GET_RATE				12
-#define WLC_GET_INFRA				19
-#define WLC_GET_AUTH				21
-#define WLC_GET_BSSID				23
-#define WLC_GET_SSID				25
-#define WLC_GET_CHANNEL				29
-#define WLC_GET_PASSIVE 			48
-#define WLC_GET_COUNTRY				83
-#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_COUNTRY_LIST		261
-#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;
-
-typedef struct wl_country_list {
-	uint32_t buflen;
-	uint32_t band_set;
-	uint32_t band;
-	uint32_t count;
-	char country_abbrev[1];
-} wl_country_list_t;
-
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/api/madwifi.h b/contrib/package/iwinfo/src/include/iwinfo/api/madwifi.h
deleted file mode 100644
index fe4b3e62a..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/api/madwifi.h
+++ /dev/null
@@ -1,158 +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)
-
-#define	SIOC80211IFCREATE			(SIOCDEVPRIVATE+7)
-#define	SIOC80211IFDESTROY	 		(SIOCDEVPRIVATE+8)
-
-#define	IEEE80211_CLONE_BSSID	0x0001	/* allocate unique mac/bssid */
-#define	IEEE80211_NO_STABEACONS	0x0002	/* Do not setup the station beacon timers */
-
-struct ieee80211_clone_params {
-	char icp_name[IFNAMSIZ];		/* device name */
-	u_int16_t icp_opmode;			/* operating mode */
-	u_int16_t icp_flags;			/* see below */
-};
-
-enum ieee80211_opmode {
-	IEEE80211_M_STA		= 1,	/* infrastructure station */
-	IEEE80211_M_IBSS 	= 0,	/* IBSS (adhoc) station */
-	IEEE80211_M_AHDEMO	= 3,	/* Old lucent compatible adhoc demo */
-	IEEE80211_M_HOSTAP	= 6,	/* Software Access Point */
-	IEEE80211_M_MONITOR	= 8,	/* Monitor mode */
-	IEEE80211_M_WDS		= 2,	/* WDS link */
-};
-
-enum {
-	IEEE80211_PARAM_AUTHMODE		= 3,	/* authentication mode */
-	IEEE80211_PARAM_MCASTCIPHER		= 5,	/* multicast/default cipher */
-	IEEE80211_PARAM_MCASTKEYLEN		= 6,	/* multicast key length */
-	IEEE80211_PARAM_UCASTCIPHERS	= 7,	/* unicast cipher suites */
-	IEEE80211_PARAM_WPA				= 10,	/* WPA mode (0,1,2) */
-};
-
-/*
- * Authentication mode.
- */
-enum ieee80211_authmode {
-	IEEE80211_AUTH_NONE	= 0,
-	IEEE80211_AUTH_OPEN	= 1,	/* open */
-	IEEE80211_AUTH_SHARED	= 2,	/* shared-key */
-	IEEE80211_AUTH_8021X	= 3,	/* 802.1x */
-	IEEE80211_AUTH_AUTO	= 4,	/* auto-select/accept */
-	/* NB: these are used only for ioctls */
-	IEEE80211_AUTH_WPA	= 5,	/* WPA/RSN w/ 802.1x/PSK */
-};
-
-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/contrib/package/iwinfo/src/include/iwinfo/api/nl80211.h b/contrib/package/iwinfo/src/include/iwinfo/api/nl80211.h
deleted file mode 100644
index 999e35421..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/api/nl80211.h
+++ /dev/null
@@ -1,1832 +0,0 @@
-#ifndef __LINUX_NL80211_H
-#define __LINUX_NL80211_H
-/*
- * 802.11 netlink interface public header
- *
- * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2008 Michael Wu <flamingice@sourmilk.net>
- * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
- * Copyright 2008 Michael Buesch <mb@bu3sch.de>
- * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
- * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
- * Copyright 2008 Colin McCabe <colin@cozybit.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include <linux/types.h>
-
-/**
- * DOC: Station handling
- *
- * Stations are added per interface, but a special case exists with VLAN
- * interfaces. When a station is bound to an AP interface, it may be moved
- * into a VLAN identified by a VLAN interface index (%NL80211_ATTR_STA_VLAN).
- * The station is still assumed to belong to the AP interface it was added
- * to.
- *
- * TODO: need more info?
- */
-
-/**
- * DOC: Frame transmission/registration support
- *
- * Frame transmission and registration support exists to allow userspace
- * management entities such as wpa_supplicant react to management frames
- * that are not being handled by the kernel. This includes, for example,
- * certain classes of action frames that cannot be handled in the kernel
- * for various reasons.
- *
- * Frame registration is done on a per-interface basis and registrations
- * cannot be removed other than by closing the socket. It is possible to
- * specify a registration filter to register, for example, only for a
- * certain type of action frame. In particular with action frames, those
- * that userspace registers for will not be returned as unhandled by the
- * driver, so that the registered application has to take responsibility
- * for doing that.
- *
- * The type of frame that can be registered for is also dependent on the
- * driver and interface type. The frame types are advertised in wiphy
- * attributes so applications know what to expect.
- *
- * NOTE: When an interface changes type while registrations are active,
- *       these registrations are ignored until the interface type is
- *       changed again. This means that changing the interface type can
- *       lead to a situation that couldn't otherwise be produced, but
- *       any such registrations will be dormant in the sense that they
- *       will not be serviced, i.e. they will not receive any frames.
- *
- * Frame transmission allows userspace to send for example the required
- * responses to action frames. It is subject to some sanity checking,
- * but many frames can be transmitted. When a frame was transmitted, its
- * status is indicated to the sending socket.
- *
- * For more technical details, see the corresponding command descriptions
- * below.
- */
-
-/**
- * enum nl80211_commands - supported nl80211 commands
- *
- * @NL80211_CMD_UNSPEC: unspecified command to catch errors
- *
- * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
- *	to get a list of all present wiphys.
- * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
- *	%NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
- *	%NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ,
- *	%NL80211_ATTR_WIPHY_CHANNEL_TYPE, %NL80211_ATTR_WIPHY_RETRY_SHORT,
- *	%NL80211_ATTR_WIPHY_RETRY_LONG, %NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
- *	and/or %NL80211_ATTR_WIPHY_RTS_THRESHOLD.
- *	However, for setting the channel, see %NL80211_CMD_SET_CHANNEL
- *	instead, the support here is for backward compatibility only.
- * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
- *	or rename notification. Has attributes %NL80211_ATTR_WIPHY and
- *	%NL80211_ATTR_WIPHY_NAME.
- * @NL80211_CMD_DEL_WIPHY: Wiphy deleted. Has attributes
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME.
- *
- * @NL80211_CMD_GET_INTERFACE: Request an interface's configuration;
- *	either a dump request on a %NL80211_ATTR_WIPHY or a specific get
- *	on an %NL80211_ATTR_IFINDEX is supported.
- * @NL80211_CMD_SET_INTERFACE: Set type of a virtual interface, requires
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_IFTYPE.
- * @NL80211_CMD_NEW_INTERFACE: Newly created virtual interface or response
- *	to %NL80211_CMD_GET_INTERFACE. Has %NL80211_ATTR_IFINDEX,
- *	%NL80211_ATTR_WIPHY and %NL80211_ATTR_IFTYPE attributes. Can also
- *	be sent from userspace to request creation of a new virtual interface,
- *	then requires attributes %NL80211_ATTR_WIPHY, %NL80211_ATTR_IFTYPE and
- *	%NL80211_ATTR_IFNAME.
- * @NL80211_CMD_DEL_INTERFACE: Virtual interface was deleted, has attributes
- *	%NL80211_ATTR_IFINDEX and %NL80211_ATTR_WIPHY. Can also be sent from
- *	userspace to request deletion of a virtual interface, then requires
- *	attribute %NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified
- *	by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC.
- * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT,
- *	%NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD.
- * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
- *	%NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC, %NL80211_ATTR_KEY_CIPHER,
- *	and %NL80211_ATTR_KEY_SEQ attributes.
- * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_IDX
- *	or %NL80211_ATTR_MAC.
- *
- * @NL80211_CMD_GET_BEACON: retrieve beacon information (returned in a
- *	%NL80222_CMD_NEW_BEACON message)
- * @NL80211_CMD_SET_BEACON: set the beacon on an access point interface
- *	using the %NL80211_ATTR_BEACON_INTERVAL, %NL80211_ATTR_DTIM_PERIOD,
- *	%NL80211_ATTR_BEACON_HEAD and %NL80211_ATTR_BEACON_TAIL attributes.
- * @NL80211_CMD_NEW_BEACON: add a new beacon to an access point interface,
- *	parameters are like for %NL80211_CMD_SET_BEACON.
- * @NL80211_CMD_DEL_BEACON: remove the beacon, stop sending it
- *
- * @NL80211_CMD_GET_STATION: Get station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_STATION: Set station attributes for station identified by
- *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_STATION: Add a station with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all stations, on the interface identified
- *	by %NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_MPATH: Get mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_MPATH:  Set mesh path attributes for mesh path to
- * 	destination %NL80211_ATTR_MAC on the interface identified by
- * 	%NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
- *	or, if no MAC address given, all mesh paths, on the interface identified
- *	by %NL80211_ATTR_IFINDEX.
- * @NL80211_CMD_SET_BSS: Set BSS attributes for BSS identified by
- *	%NL80211_ATTR_IFINDEX.
- *
- * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
- * 	regulatory domain.
- * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
- *	after being queried by the kernel. CRDA replies by sending a regulatory
- *	domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
- *	current alpha2 if it found a match. It also provides
- * 	NL80211_ATTR_REG_RULE_FLAGS, and a set of regulatory rules. Each
- * 	regulatory rule is a nested set of attributes  given by
- * 	%NL80211_ATTR_REG_RULE_FREQ_[START|END] and
- * 	%NL80211_ATTR_FREQ_RANGE_MAX_BW with an attached power rule given by
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_ANT_GAIN and
- * 	%NL80211_ATTR_REG_RULE_POWER_MAX_EIRP.
- * @NL80211_CMD_REQ_SET_REG: ask the wireless core to set the regulatory domain
- * 	to the specified ISO/IEC 3166-1 alpha2 country code. The core will
- * 	store this as a valid request and then query userspace for it.
- *
- * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the
- *	interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MESH_PARAMS: Set mesh networking properties for the
- *      interface identified by %NL80211_ATTR_IFINDEX
- *
- * @NL80211_CMD_SET_MGMT_EXTRA_IE: Set extra IEs for management frames. The
- *	interface is identified with %NL80211_ATTR_IFINDEX and the management
- *	frame subtype with %NL80211_ATTR_MGMT_SUBTYPE. The extra IE data to be
- *	added to the end of the specified management frame is specified with
- *	%NL80211_ATTR_IE. If the command succeeds, the requested data will be
- *	added to all specified management frames generated by
- *	kernel/firmware/driver.
- *	Note: This command has been removed and it is only reserved at this
- *	point to avoid re-using existing command number. The functionality this
- *	command was planned for has been provided with cleaner design with the
- *	option to specify additional IEs in NL80211_CMD_TRIGGER_SCAN,
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_ASSOCIATE,
- *	NL80211_CMD_DEAUTHENTICATE, and NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_CMD_GET_SCAN: get scan results
- * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
- * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
- *	NL80211_CMD_GET_SCAN and on the "scan" multicast group)
- * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
- *	partial scan results may be available
- *
- * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
- *      or noise level
- * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
- *	NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
- *
- * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
- * 	has been changed and provides details of the request information
- * 	that caused the change such as who initiated the regulatory request
- * 	(%NL80211_ATTR_REG_INITIATOR), the wiphy_idx
- * 	(%NL80211_ATTR_REG_ALPHA2) on which the request was made from if
- * 	the initiator was %NL80211_REGDOM_SET_BY_COUNTRY_IE or
- * 	%NL80211_REGDOM_SET_BY_DRIVER, the type of regulatory domain
- * 	set (%NL80211_ATTR_REG_TYPE), if the type of regulatory domain is
- * 	%NL80211_REG_TYPE_COUNTRY the alpha2 to which we have moved on
- * 	to (%NL80211_ATTR_REG_ALPHA2).
- * @NL80211_CMD_REG_BEACON_HINT: indicates to userspace that an AP beacon
- * 	has been found while world roaming thus enabling active scan or
- * 	any mode of operation that initiates TX (beacons) on a channel
- * 	where we would not have been able to do either before. As an example
- * 	if you are world roaming (regulatory domain set to world or if your
- * 	driver is using a custom world roaming regulatory domain) and while
- * 	doing a passive scan on the 5 GHz band you find an AP there (if not
- * 	on a DFS channel) you will now be able to actively scan for that AP
- * 	or use AP mode on your card on that same channel. Note that this will
- * 	never be used for channels 1-11 on the 2 GHz band as they are always
- * 	enabled world wide. This beacon hint is only sent if your device had
- * 	either disabled active scanning or beaconing on a channel. We send to
- * 	userspace the wiphy on which we removed a restriction from
- * 	(%NL80211_ATTR_WIPHY) and the channel on which this occurred
- * 	before (%NL80211_ATTR_FREQ_BEFORE) and after (%NL80211_ATTR_FREQ_AFTER)
- * 	the beacon hint was processed.
- *
- * @NL80211_CMD_AUTHENTICATE: authentication request and notification.
- *	This command is used both as a command (request to authenticate) and
- *	as an event on the "mlme" multicast group indicating completion of the
- *	authentication process.
- *	When used as a command, %NL80211_ATTR_IFINDEX is used to identify the
- *	interface. %NL80211_ATTR_MAC is used to specify PeerSTAAddress (and
- *	BSSID in case of station mode). %NL80211_ATTR_SSID is used to specify
- *	the SSID (mainly for association, but is included in authentication
- *	request, too, to help BSS selection. %NL80211_ATTR_WIPHY_FREQ is used
- *	to specify the frequence of the channel in MHz. %NL80211_ATTR_AUTH_TYPE
- *	is used to specify the authentication type. %NL80211_ATTR_IE is used to
- *	define IEs (VendorSpecificInfo, but also including RSN IE and FT IEs)
- *	to be added to the frame.
- *	When used as an event, this reports reception of an Authentication
- *	frame in station and IBSS modes when the local MLME processed the
- *	frame, i.e., it was for the local STA and was received in correct
- *	state. This is similar to MLME-AUTHENTICATE.confirm primitive in the
- *	MLME SAP interface (kernel providing MLME, userspace SME). The
- *	included %NL80211_ATTR_FRAME attribute contains the management frame
- *	(including both the header and frame body, but not FCS). This event is
- *	also used to indicate if the authentication attempt timed out. In that
- *	case the %NL80211_ATTR_FRAME attribute is replaced with a
- *	%NL80211_ATTR_TIMED_OUT flag (and %NL80211_ATTR_MAC to indicate which
- *	pending authentication timed out).
- * @NL80211_CMD_ASSOCIATE: association request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Association and Reassociation
- *	(similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
- *	MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
- * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
- *	MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
- *	primitives).
- * @NL80211_CMD_DISASSOCIATE: disassociation request and notification; like
- *	NL80211_CMD_AUTHENTICATE but for Disassociation frames (similar to
- *	MLME-DISASSOCIATE.request and MLME-DISASSOCIATE.indication primitives).
- *
- * @NL80211_CMD_MICHAEL_MIC_FAILURE: notification of a locally detected Michael
- *	MIC (part of TKIP) failure; sent on the "mlme" multicast group; the
- *	event includes %NL80211_ATTR_MAC to describe the source MAC address of
- *	the frame with invalid MIC, %NL80211_ATTR_KEY_TYPE to show the key
- *	type, %NL80211_ATTR_KEY_IDX to indicate the key identifier, and
- *	%NL80211_ATTR_KEY_SEQ to indicate the TSC value of the frame; this
- *	event matches with MLME-MICHAELMICFAILURE.indication() primitive
- *
- * @NL80211_CMD_JOIN_IBSS: Join a new IBSS -- given at least an SSID and a
- *	FREQ attribute (for the initial frequency if no peer can be found)
- *	and optionally a MAC (as BSSID) and FREQ_FIXED attribute if those
- *	should be fixed rather than automatically determined. Can only be
- *	executed on a network interface that is UP, and fixed BSSID/FREQ
- *	may be rejected. Another optional parameter is the beacon interval,
- *	given in the %NL80211_ATTR_BEACON_INTERVAL attribute, which if not
- *	given defaults to 100 TU (102.4ms).
- * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
- *	determined by the network interface.
- *
- * @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute
- *	to identify the device, and the TESTDATA blob attribute to pass through
- *	to the driver.
- *
- * @NL80211_CMD_CONNECT: connection request and notification; this command
- *	requests to connect to a specified network but without separating
- *	auth and assoc steps. For this, you need to specify the SSID in a
- *	%NL80211_ATTR_SSID attribute, and can optionally specify the association
- *	IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
- *	%NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
- *	%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
- *	It is also sent as an event, with the BSSID and response IEs when the
- *	connection is established or failed to be established. This can be
- *	determined by the STATUS_CODE attribute.
- * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
- *	sent as an event when the card/driver roamed by itself.
- * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
- *	userspace that a connection was dropped by the AP or due to other
- *	reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
- *	%NL80211_ATTR_REASON_CODE attributes are used.
- *
- * @NL80211_CMD_SET_WIPHY_NETNS: Set a wiphy's netns. Note that all devices
- *	associated with this wiphy must be down and will follow.
- *
- * @NL80211_CMD_REMAIN_ON_CHANNEL: Request to remain awake on the specified
- *	channel for the specified amount of time. This can be used to do
- *	off-channel operations like transmit a Public Action frame and wait for
- *	a response while being associated to an AP on another channel.
- *	%NL80211_ATTR_IFINDEX is used to specify which interface (and thus
- *	radio) is used. %NL80211_ATTR_WIPHY_FREQ is used to specify the
- *	frequency for the operation and %NL80211_ATTR_WIPHY_CHANNEL_TYPE may be
- *	optionally used to specify additional channel parameters.
- *	%NL80211_ATTR_DURATION is used to specify the duration in milliseconds
- *	to remain on the channel. This command is also used as an event to
- *	notify when the requested duration starts (it may take a while for the
- *	driver to schedule this time due to other concurrent needs for the
- *	radio).
- *	When called, this operation returns a cookie (%NL80211_ATTR_COOKIE)
- *	that will be included with any events pertaining to this request;
- *	the cookie is also used to cancel the request.
- * @NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL: This command can be used to cancel a
- *	pending remain-on-channel duration if the desired operation has been
- *	completed prior to expiration of the originally requested duration.
- *	%NL80211_ATTR_WIPHY or %NL80211_ATTR_IFINDEX is used to specify the
- *	radio. The %NL80211_ATTR_COOKIE attribute must be given as well to
- *	uniquely identify the request.
- *	This command is also used as an event to notify when a requested
- *	remain-on-channel duration has expired.
- *
- * @NL80211_CMD_SET_TX_BITRATE_MASK: Set the mask of rates to be used in TX
- *	rate selection. %NL80211_ATTR_IFINDEX is used to specify the interface
- *	and @NL80211_ATTR_TX_RATES the set of allowed rates.
- *
- * @NL80211_CMD_REGISTER_FRAME: Register for receiving certain mgmt frames
- *	(via @NL80211_CMD_FRAME) for processing in userspace. This command
- *	requires an interface index, a frame type attribute (optional for
- *	backward compatibility reasons, if not given assumes action frames)
- *	and a match attribute containing the first few bytes of the frame
- *	that should match, e.g. a single byte for only a category match or
- *	four bytes for vendor frames including the OUI. The registration
- *	cannot be dropped, but is removed automatically when the netlink
- *	socket is closed. Multiple registrations can be made.
- * @NL80211_CMD_REGISTER_ACTION: Alias for @NL80211_CMD_REGISTER_FRAME for
- *	backward compatibility
- * @NL80211_CMD_FRAME: Management frame TX request and RX notification. This
- *	command is used both as a request to transmit a management frame and
- *	as an event indicating reception of a frame that was not processed in
- *	kernel code, but is for us (i.e., which may need to be processed in a
- *	user space application). %NL80211_ATTR_FRAME is used to specify the
- *	frame contents (including header). %NL80211_ATTR_WIPHY_FREQ (and
- *	optionally %NL80211_ATTR_WIPHY_CHANNEL_TYPE) is used to indicate on
- *	which channel the frame is to be transmitted or was received. This
- *	channel has to be the current channel (remain-on-channel or the
- *	operational channel). When called, this operation returns a cookie
- *	(%NL80211_ATTR_COOKIE) that will be included with the TX status event
- *	pertaining to the TX request.
- * @NL80211_CMD_ACTION: Alias for @NL80211_CMD_FRAME for backward compatibility.
- * @NL80211_CMD_FRAME_TX_STATUS: Report TX status of a management frame
- *	transmitted with %NL80211_CMD_FRAME. %NL80211_ATTR_COOKIE identifies
- *	the TX command and %NL80211_ATTR_FRAME includes the contents of the
- *	frame. %NL80211_ATTR_ACK flag is included if the recipient acknowledged
- *	the frame.
- * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
- *	backward compatibility.
- * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
- *	is used to configure connection quality monitoring notification trigger
- *	levels.
- * @NL80211_CMD_NOTIFY_CQM: Connection quality monitor notification. This
- *	command is used as an event to indicate the that a trigger level was
- *	reached.
- * @NL80211_CMD_SET_CHANNEL: Set the channel (using %NL80211_ATTR_WIPHY_FREQ
- *	and %NL80211_ATTR_WIPHY_CHANNEL_TYPE) the given interface (identifed
- *	by %NL80211_ATTR_IFINDEX) shall operate on.
- *	In case multiple channels are supported by the device, the mechanism
- *	with which it switches channels is implementation-defined.
- *	When a monitor interface is given, it can only switch channel while
- *	no other interfaces are operating to avoid disturbing the operation
- *	of any other interfaces, and other interfaces will again take
- *	precedence when they are used.
- *
- * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
- *
- * @NL80211_CMD_MAX: highest used command number
- * @__NL80211_CMD_AFTER_LAST: internal use
- */
-enum nl80211_commands {
-/* don't change the order or add anything inbetween, this is ABI! */
-	NL80211_CMD_UNSPEC,
-
-	NL80211_CMD_GET_WIPHY,		/* can dump */
-	NL80211_CMD_SET_WIPHY,
-	NL80211_CMD_NEW_WIPHY,
-	NL80211_CMD_DEL_WIPHY,
-
-	NL80211_CMD_GET_INTERFACE,	/* can dump */
-	NL80211_CMD_SET_INTERFACE,
-	NL80211_CMD_NEW_INTERFACE,
-	NL80211_CMD_DEL_INTERFACE,
-
-	NL80211_CMD_GET_KEY,
-	NL80211_CMD_SET_KEY,
-	NL80211_CMD_NEW_KEY,
-	NL80211_CMD_DEL_KEY,
-
-	NL80211_CMD_GET_BEACON,
-	NL80211_CMD_SET_BEACON,
-	NL80211_CMD_NEW_BEACON,
-	NL80211_CMD_DEL_BEACON,
-
-	NL80211_CMD_GET_STATION,
-	NL80211_CMD_SET_STATION,
-	NL80211_CMD_NEW_STATION,
-	NL80211_CMD_DEL_STATION,
-
-	NL80211_CMD_GET_MPATH,
-	NL80211_CMD_SET_MPATH,
-	NL80211_CMD_NEW_MPATH,
-	NL80211_CMD_DEL_MPATH,
-
-	NL80211_CMD_SET_BSS,
-
-	NL80211_CMD_SET_REG,
-	NL80211_CMD_REQ_SET_REG,
-
-	NL80211_CMD_GET_MESH_PARAMS,
-	NL80211_CMD_SET_MESH_PARAMS,
-
-	NL80211_CMD_SET_MGMT_EXTRA_IE /* reserved; not used */,
-
-	NL80211_CMD_GET_REG,
-
-	NL80211_CMD_GET_SCAN,
-	NL80211_CMD_TRIGGER_SCAN,
-	NL80211_CMD_NEW_SCAN_RESULTS,
-	NL80211_CMD_SCAN_ABORTED,
-
-	NL80211_CMD_REG_CHANGE,
-
-	NL80211_CMD_AUTHENTICATE,
-	NL80211_CMD_ASSOCIATE,
-	NL80211_CMD_DEAUTHENTICATE,
-	NL80211_CMD_DISASSOCIATE,
-
-	NL80211_CMD_MICHAEL_MIC_FAILURE,
-
-	NL80211_CMD_REG_BEACON_HINT,
-
-	NL80211_CMD_JOIN_IBSS,
-	NL80211_CMD_LEAVE_IBSS,
-
-	NL80211_CMD_TESTMODE,
-
-	NL80211_CMD_CONNECT,
-	NL80211_CMD_ROAM,
-	NL80211_CMD_DISCONNECT,
-
-	NL80211_CMD_SET_WIPHY_NETNS,
-
-	NL80211_CMD_GET_SURVEY,
-	NL80211_CMD_NEW_SURVEY_RESULTS,
-
-	NL80211_CMD_SET_PMKSA,
-	NL80211_CMD_DEL_PMKSA,
-	NL80211_CMD_FLUSH_PMKSA,
-
-	NL80211_CMD_REMAIN_ON_CHANNEL,
-	NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL,
-
-	NL80211_CMD_SET_TX_BITRATE_MASK,
-
-	NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_REGISTER_ACTION = NL80211_CMD_REGISTER_FRAME,
-	NL80211_CMD_FRAME,
-	NL80211_CMD_ACTION = NL80211_CMD_FRAME,
-	NL80211_CMD_FRAME_TX_STATUS,
-	NL80211_CMD_ACTION_TX_STATUS = NL80211_CMD_FRAME_TX_STATUS,
-
-	NL80211_CMD_SET_POWER_SAVE,
-	NL80211_CMD_GET_POWER_SAVE,
-
-	NL80211_CMD_SET_CQM,
-	NL80211_CMD_NOTIFY_CQM,
-
-	NL80211_CMD_SET_CHANNEL,
-	NL80211_CMD_SET_WDS_PEER,
-
-	/* add new commands above here */
-
-	/* used to define NL80211_CMD_MAX below */
-	__NL80211_CMD_AFTER_LAST,
-	NL80211_CMD_MAX = __NL80211_CMD_AFTER_LAST - 1
-};
-
-/*
- * Allow user space programs to use #ifdef on new commands by defining them
- * here
- */
-#define NL80211_CMD_SET_BSS NL80211_CMD_SET_BSS
-#define NL80211_CMD_SET_MGMT_EXTRA_IE NL80211_CMD_SET_MGMT_EXTRA_IE
-#define NL80211_CMD_REG_CHANGE NL80211_CMD_REG_CHANGE
-#define NL80211_CMD_AUTHENTICATE NL80211_CMD_AUTHENTICATE
-#define NL80211_CMD_ASSOCIATE NL80211_CMD_ASSOCIATE
-#define NL80211_CMD_DEAUTHENTICATE NL80211_CMD_DEAUTHENTICATE
-#define NL80211_CMD_DISASSOCIATE NL80211_CMD_DISASSOCIATE
-#define NL80211_CMD_REG_BEACON_HINT NL80211_CMD_REG_BEACON_HINT
-
-/**
- * enum nl80211_attrs - nl80211 netlink attributes
- *
- * @NL80211_ATTR_UNSPEC: unspecified attribute to catch errors
- *
- * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
- *	/sys/class/ieee80211/<phyname>/index
- * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
- * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
- * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz
- * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
- *	if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included):
- *	NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
- *		this attribute)
- *	NL80211_CHAN_HT20 = HT20 only
- *	NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
- *	NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
- * @NL80211_ATTR_WIPHY_RETRY_SHORT: TX retry limit for frames whose length is
- *	less than or equal to the RTS threshold; allowed range: 1..255;
- *	dot11ShortRetryLimit; u8
- * @NL80211_ATTR_WIPHY_RETRY_LONG: TX retry limit for frames whose length is
- *	greater than the RTS threshold; allowed range: 1..255;
- *	dot11ShortLongLimit; u8
- * @NL80211_ATTR_WIPHY_FRAG_THRESHOLD: fragmentation threshold, i.e., maximum
- *	length in octets for frames; allowed range: 256..8000, disable
- *	fragmentation with (u32)-1; dot11FragmentationThreshold; u32
- * @NL80211_ATTR_WIPHY_RTS_THRESHOLD: RTS threshold (TX frames with length
- *	larger than or equal to this use RTS/CTS handshake); allowed range:
- *	0..65536, disable with (u32)-1; dot11RTSThreshold; u32
- * @NL80211_ATTR_WIPHY_COVERAGE_CLASS: Coverage Class as defined by IEEE 802.11
- *	section 7.3.2.9; dot11CoverageClass; u8
- *
- * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
- * @NL80211_ATTR_IFNAME: network interface name
- * @NL80211_ATTR_IFTYPE: type of virtual interface, see &enum nl80211_iftype
- *
- * @NL80211_ATTR_MAC: MAC address (various uses)
- *
- * @NL80211_ATTR_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_ATTR_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_ATTR_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- *
- * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
- * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
- * @NL80211_ATTR_BEACON_HEAD: portion of the beacon before the TIM IE
- * @NL80211_ATTR_BEACON_TAIL: portion of the beacon after the TIM IE
- *
- * @NL80211_ATTR_STA_AID: Association ID for the station (u16)
- * @NL80211_ATTR_STA_FLAGS: flags, nested element with NLA_FLAG attributes of
- *	&enum nl80211_sta_flags (deprecated, use %NL80211_ATTR_STA_FLAGS2)
- * @NL80211_ATTR_STA_LISTEN_INTERVAL: listen interval as defined by
- *	IEEE 802.11 7.3.1.6 (u16).
- * @NL80211_ATTR_STA_SUPPORTED_RATES: supported rates, array of supported
- *	rates as defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- * @NL80211_ATTR_STA_VLAN: interface index of VLAN interface to move station
- *	to, or the AP interface the station was originally added to to.
- * @NL80211_ATTR_STA_INFO: information about a station, part of station info
- *	given for %NL80211_CMD_GET_STATION, nested attribute containing
- *	info as possible, see &enum nl80211_sta_info.
- *
- * @NL80211_ATTR_WIPHY_BANDS: Information about an operating bands,
- *	consisting of a nested array.
- *
- * @NL80211_ATTR_MESH_ID: mesh id (1-32 bytes).
- * @NL80211_ATTR_PLINK_ACTION: action to perform on the mesh peer link.
- * @NL80211_ATTR_MPATH_NEXT_HOP: MAC address of the next hop for a mesh path.
- * @NL80211_ATTR_MPATH_INFO: information about a mesh_path, part of mesh path
- * 	info given for %NL80211_CMD_GET_MPATH, nested attribute described at
- *	&enum nl80211_mpath_info.
- *
- * @NL80211_ATTR_MNTR_FLAGS: flags, nested element with NLA_FLAG attributes of
- *      &enum nl80211_mntr_flags.
- *
- * @NL80211_ATTR_REG_ALPHA2: an ISO-3166-alpha2 country code for which the
- * 	current regulatory domain should be set to or is already set to.
- * 	For example, 'CR', for Costa Rica. This attribute is used by the kernel
- * 	to query the CRDA to retrieve one regulatory domain. This attribute can
- * 	also be used by userspace to query the kernel for the currently set
- * 	regulatory domain. We chose an alpha2 as that is also used by the
- * 	IEEE-802.11d country information element to identify a country.
- * 	Users can also simply ask the wireless core to set regulatory domain
- * 	to a specific alpha2.
- * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory
- *	rules.
- *
- * @NL80211_ATTR_BSS_CTS_PROT: whether CTS protection is enabled (u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_PREAMBLE: whether short preamble is enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_SHORT_SLOT_TIME: whether short slot time enabled
- *	(u8, 0 or 1)
- * @NL80211_ATTR_BSS_BASIC_RATES: basic rates, array of basic
- *	rates in format defined by IEEE 802.11 7.3.2.2 but without the length
- *	restriction (at most %NL80211_MAX_SUPP_RATES).
- *
- * @NL80211_ATTR_HT_CAPABILITY: HT Capability information element (from
- *	association request when used with NL80211_CMD_NEW_STATION)
- *
- * @NL80211_ATTR_SUPPORTED_IFTYPES: nested attribute containing all
- *	supported interface types, each a flag attribute with the number
- *	of the interface mode.
- *
- * @NL80211_ATTR_MGMT_SUBTYPE: Management frame subtype for
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE.
- *
- * @NL80211_ATTR_IE: Information element(s) data (used, e.g., with
- *	%NL80211_CMD_SET_MGMT_EXTRA_IE).
- *
- * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
- *	a single scan request, a wiphy attribute.
- * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
- *	that can be added to a scan request
- *
- * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
- * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
- *	scanning and include a zero-length SSID (wildcard) for wildcard scan
- * @NL80211_ATTR_BSS: scan result BSS
- *
- * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
- * 	currently in effect. This could be any of the %NL80211_REGDOM_SET_BY_*
- * @NL80211_ATTR_REG_TYPE: indicates the type of the regulatory domain currently
- * 	set. This can be one of the nl80211_reg_type (%NL80211_REGDOM_TYPE_*)
- *
- * @NL80211_ATTR_SUPPORTED_COMMANDS: wiphy attribute that specifies
- *	an array of command numbers (i.e. a mapping index to command number)
- *	that the driver for the given wiphy supports.
- *
- * @NL80211_ATTR_FRAME: frame data (binary attribute), including frame header
- *	and body, but not FCS; used, e.g., with NL80211_CMD_AUTHENTICATE and
- *	NL80211_CMD_ASSOCIATE events
- * @NL80211_ATTR_SSID: SSID (binary attribute, 0..32 octets)
- * @NL80211_ATTR_AUTH_TYPE: AuthenticationType, see &enum nl80211_auth_type,
- *	represented as a u32
- * @NL80211_ATTR_REASON_CODE: ReasonCode for %NL80211_CMD_DEAUTHENTICATE and
- *	%NL80211_CMD_DISASSOCIATE, u16
- *
- * @NL80211_ATTR_KEY_TYPE: Key Type, see &enum nl80211_key_type, represented as
- *	a u32
- *
- * @NL80211_ATTR_FREQ_BEFORE: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _before_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- * @NL80211_ATTR_FREQ_AFTER: A channel which has suffered a regulatory change
- * 	due to considerations from a beacon hint. This attribute reflects
- * 	the state of the channel _after_ the beacon hint processing. This
- * 	attributes consists of a nested attribute containing
- * 	NL80211_FREQUENCY_ATTR_*
- *
- * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
- *	cipher suites
- *
- * @NL80211_ATTR_FREQ_FIXED: a flag indicating the IBSS should not try to look
- *	for other networks on different channels
- *
- * @NL80211_ATTR_TIMED_OUT: a flag indicating than an operation timed out; this
- *	is used, e.g., with %NL80211_CMD_AUTHENTICATE event
- *
- * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
- *	used for the association (&enum nl80211_mfp, represented as a u32);
- *	this attribute can be used
- *	with %NL80211_CMD_ASSOCIATE request
- *
- * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
- *	&struct nl80211_sta_flag_update.
- *
- * @NL80211_ATTR_CONTROL_PORT: A flag indicating whether user space controls
- *	IEEE 802.1X port, i.e., sets/clears %NL80211_STA_FLAG_AUTHORIZED, in
- *	station mode. If the flag is included in %NL80211_CMD_ASSOCIATE
- *	request, the driver will assume that the port is unauthorized until
- *	authorized by user space. Otherwise, port is marked authorized by
- *	default in station mode.
- * @NL80211_ATTR_CONTROL_PORT_ETHERTYPE: A 16-bit value indicating the
- *	ethertype that will be used for key negotiation. It can be
- *	specified with the associate and connect commands. If it is not
- *	specified, the value defaults to 0x888E (PAE, 802.1X). This
- *	attribute is also used as a flag in the wiphy information to
- *	indicate that protocols other than PAE are supported.
- * @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
- *	%NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
- *	ethertype frames used for key negotiation must not be encrypted.
- *
- * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
- *	We recommend using nested, driver-specific attributes within this.
- *
- * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
- *	event was due to the AP disconnecting the station, and not due to
- *	a local disconnect request.
- * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
- *	event (u16)
- * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
- *	that protected APs should be used.
- *
- * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT and ASSOCIATE to
- *	indicate which unicast key ciphers will be used with the connection
- *	(an array of u32).
- * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT and ASSOCIATE to indicate
- *	which group key cipher will be used with the connection (a u32).
- * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT and ASSOCIATE to indicate
- *	which WPA version(s) the AP we want to associate with is using
- *	(a u32 with flags from &enum nl80211_wpa_versions).
- * @NL80211_ATTR_AKM_SUITES: Used with CONNECT and ASSOCIATE to indicate
- *	which key management algorithm(s) to use (an array of u32).
- *
- * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
- *	sent out by the card, for ROAM and successful CONNECT events.
- * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
- *	sent by peer, for ROAM and successful CONNECT events.
- *
- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
- *	commands to specify using a reassociate frame
- *
- * @NL80211_ATTR_KEY: key information in a nested attribute with
- *	%NL80211_KEY_* sub-attributes
- * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect()
- *	and join_ibss(), key information is in a nested attribute each
- *	with %NL80211_KEY_* sub-attributes
- *
- * @NL80211_ATTR_PID: Process ID of a network namespace.
- *
- * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for
- *	dumps. This number increases whenever the object list being
- *	dumped changes, and as such userspace can verify that it has
- *	obtained a complete and consistent snapshot by verifying that
- *	all dump messages contain the same generation number. If it
- *	changed then the list changed and the dump should be repeated
- *	completely from scratch.
- *
- * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
- *
- * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
- *      the survey response for %NL80211_CMD_GET_SURVEY, nested attribute
- *      containing info as possible, see &enum survey_info.
- *
- * @NL80211_ATTR_PMKID: PMK material for PMKSA caching.
- * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can
- *	cache, a wiphy attribute.
- *
- * @NL80211_ATTR_DURATION: Duration of an operation in milliseconds, u32.
- *
- * @NL80211_ATTR_COOKIE: Generic 64-bit cookie to identify objects.
- *
- * @NL80211_ATTR_TX_RATES: Nested set of attributes
- *	(enum nl80211_tx_rate_attributes) describing TX rates per band. The
- *	enum nl80211_band value is used as the index (nla_type() of the nested
- *	data. If a band is not included, it will be configured to allow all
- *	rates based on negotiated supported rates information. This attribute
- *	is used with %NL80211_CMD_SET_TX_BITRATE_MASK.
- *
- * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
- *	at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
- * @NL80211_ATTR_FRAME_TYPE: A u16 indicating the frame type/subtype for the
- *	@NL80211_CMD_REGISTER_FRAME command.
- * @NL80211_ATTR_TX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be transmitted with
- *	%NL80211_CMD_FRAME.
- * @NL80211_ATTR_RX_FRAME_TYPES: wiphy capability attribute, which is a
- *	nested attribute of %NL80211_ATTR_FRAME_TYPE attributes, containing
- *	information about which frame types can be registered for RX.
- *
- * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
- *	acknowledged by the recipient.
- *
- * @NL80211_ATTR_CQM: connection quality monitor configuration in a
- *	nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
- *
- * @NL80211_ATTR_LOCAL_STATE_CHANGE: Flag attribute to indicate that a command
- *	is requesting a local authentication/association state change without
- *	invoking actual management frame exchange. This can be used with
- *	NL80211_CMD_AUTHENTICATE, NL80211_CMD_DEAUTHENTICATE,
- *	NL80211_CMD_DISASSOCIATE.
- *
- * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
- *	connected to this BSS.
- *
- * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
- *      &enum nl80211_tx_power_setting for possible values.
- * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
- *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
- *      for non-automatic settings.
- *
- * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
- *	means support for per-station GTKs.
- *
- * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
- *
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_attrs {
-/* don't change the order or add anything inbetween, this is ABI! */
-	NL80211_ATTR_UNSPEC,
-
-	NL80211_ATTR_WIPHY,
-	NL80211_ATTR_WIPHY_NAME,
-
-	NL80211_ATTR_IFINDEX,
-	NL80211_ATTR_IFNAME,
-	NL80211_ATTR_IFTYPE,
-
-	NL80211_ATTR_MAC,
-
-	NL80211_ATTR_KEY_DATA,
-	NL80211_ATTR_KEY_IDX,
-	NL80211_ATTR_KEY_CIPHER,
-	NL80211_ATTR_KEY_SEQ,
-	NL80211_ATTR_KEY_DEFAULT,
-
-	NL80211_ATTR_BEACON_INTERVAL,
-	NL80211_ATTR_DTIM_PERIOD,
-	NL80211_ATTR_BEACON_HEAD,
-	NL80211_ATTR_BEACON_TAIL,
-
-	NL80211_ATTR_STA_AID,
-	NL80211_ATTR_STA_FLAGS,
-	NL80211_ATTR_STA_LISTEN_INTERVAL,
-	NL80211_ATTR_STA_SUPPORTED_RATES,
-	NL80211_ATTR_STA_VLAN,
-	NL80211_ATTR_STA_INFO,
-
-	NL80211_ATTR_WIPHY_BANDS,
-
-	NL80211_ATTR_MNTR_FLAGS,
-
-	NL80211_ATTR_MESH_ID,
-	NL80211_ATTR_STA_PLINK_ACTION,
-	NL80211_ATTR_MPATH_NEXT_HOP,
-	NL80211_ATTR_MPATH_INFO,
-
-	NL80211_ATTR_BSS_CTS_PROT,
-	NL80211_ATTR_BSS_SHORT_PREAMBLE,
-	NL80211_ATTR_BSS_SHORT_SLOT_TIME,
-
-	NL80211_ATTR_HT_CAPABILITY,
-
-	NL80211_ATTR_SUPPORTED_IFTYPES,
-
-	NL80211_ATTR_REG_ALPHA2,
-	NL80211_ATTR_REG_RULES,
-
-	NL80211_ATTR_MESH_PARAMS,
-
-	NL80211_ATTR_BSS_BASIC_RATES,
-
-	NL80211_ATTR_WIPHY_TXQ_PARAMS,
-	NL80211_ATTR_WIPHY_FREQ,
-	NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-
-	NL80211_ATTR_KEY_DEFAULT_MGMT,
-
-	NL80211_ATTR_MGMT_SUBTYPE,
-	NL80211_ATTR_IE,
-
-	NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
-
-	NL80211_ATTR_SCAN_FREQUENCIES,
-	NL80211_ATTR_SCAN_SSIDS,
-	NL80211_ATTR_GENERATION, /* replaces old SCAN_GENERATION */
-	NL80211_ATTR_BSS,
-
-	NL80211_ATTR_REG_INITIATOR,
-	NL80211_ATTR_REG_TYPE,
-
-	NL80211_ATTR_SUPPORTED_COMMANDS,
-
-	NL80211_ATTR_FRAME,
-	NL80211_ATTR_SSID,
-	NL80211_ATTR_AUTH_TYPE,
-	NL80211_ATTR_REASON_CODE,
-
-	NL80211_ATTR_KEY_TYPE,
-
-	NL80211_ATTR_MAX_SCAN_IE_LEN,
-	NL80211_ATTR_CIPHER_SUITES,
-
-	NL80211_ATTR_FREQ_BEFORE,
-	NL80211_ATTR_FREQ_AFTER,
-
-	NL80211_ATTR_FREQ_FIXED,
-
-
-	NL80211_ATTR_WIPHY_RETRY_SHORT,
-	NL80211_ATTR_WIPHY_RETRY_LONG,
-	NL80211_ATTR_WIPHY_FRAG_THRESHOLD,
-	NL80211_ATTR_WIPHY_RTS_THRESHOLD,
-
-	NL80211_ATTR_TIMED_OUT,
-
-	NL80211_ATTR_USE_MFP,
-
-	NL80211_ATTR_STA_FLAGS2,
-
-	NL80211_ATTR_CONTROL_PORT,
-
-	NL80211_ATTR_TESTDATA,
-
-	NL80211_ATTR_PRIVACY,
-
-	NL80211_ATTR_DISCONNECTED_BY_AP,
-	NL80211_ATTR_STATUS_CODE,
-
-	NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
-	NL80211_ATTR_CIPHER_SUITE_GROUP,
-	NL80211_ATTR_WPA_VERSIONS,
-	NL80211_ATTR_AKM_SUITES,
-
-	NL80211_ATTR_REQ_IE,
-	NL80211_ATTR_RESP_IE,
-
-	NL80211_ATTR_PREV_BSSID,
-
-	NL80211_ATTR_KEY,
-	NL80211_ATTR_KEYS,
-
-	NL80211_ATTR_PID,
-
-	NL80211_ATTR_4ADDR,
-
-	NL80211_ATTR_SURVEY_INFO,
-
-	NL80211_ATTR_PMKID,
-	NL80211_ATTR_MAX_NUM_PMKIDS,
-
-	NL80211_ATTR_DURATION,
-
-	NL80211_ATTR_COOKIE,
-
-	NL80211_ATTR_WIPHY_COVERAGE_CLASS,
-
-	NL80211_ATTR_TX_RATES,
-
-	NL80211_ATTR_FRAME_MATCH,
-
-	NL80211_ATTR_ACK,
-
-	NL80211_ATTR_PS_STATE,
-
-	NL80211_ATTR_CQM,
-
-	NL80211_ATTR_LOCAL_STATE_CHANGE,
-
-	NL80211_ATTR_AP_ISOLATE,
-
-	NL80211_ATTR_WIPHY_TX_POWER_SETTING,
-	NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
-
-	NL80211_ATTR_TX_FRAME_TYPES,
-	NL80211_ATTR_RX_FRAME_TYPES,
-	NL80211_ATTR_FRAME_TYPE,
-
-	NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
-	NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
-
-	NL80211_ATTR_SUPPORT_IBSS_RSN,
-
-	NL80211_ATTR_MCAST_RATE,
-
-	/* add attributes here, update the policy in nl80211.c */
-
-	__NL80211_ATTR_AFTER_LAST,
-	NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
-};
-
-/* source-level API compatibility */
-#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
-
-/*
- * Allow user space programs to use #ifdef on new attributes by defining them
- * here
- */
-#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
-#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
-#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
-#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
-#define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
-#define NL80211_ATTR_WIPHY_CHANNEL_TYPE NL80211_ATTR_WIPHY_CHANNEL_TYPE
-#define NL80211_ATTR_MGMT_SUBTYPE NL80211_ATTR_MGMT_SUBTYPE
-#define NL80211_ATTR_IE NL80211_ATTR_IE
-#define NL80211_ATTR_REG_INITIATOR NL80211_ATTR_REG_INITIATOR
-#define NL80211_ATTR_REG_TYPE NL80211_ATTR_REG_TYPE
-#define NL80211_ATTR_FRAME NL80211_ATTR_FRAME
-#define NL80211_ATTR_SSID NL80211_ATTR_SSID
-#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
-#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
-#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
-#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
-#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
-#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
-#define NL80211_ATTR_KEY NL80211_ATTR_KEY
-#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
-
-#define NL80211_MAX_SUPP_RATES			32
-#define NL80211_MAX_SUPP_REG_RULES		32
-#define NL80211_TKIP_DATA_OFFSET_ENCR_KEY	0
-#define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY	16
-#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
-#define NL80211_HT_CAPABILITY_LEN		26
-
-#define NL80211_MAX_NR_CIPHER_SUITES		5
-#define NL80211_MAX_NR_AKM_SUITES		2
-
-/**
- * enum nl80211_iftype - (virtual) interface types
- *
- * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
- * @NL80211_IFTYPE_ADHOC: independent BSS member
- * @NL80211_IFTYPE_STATION: managed BSS member
- * @NL80211_IFTYPE_AP: access point
- * @NL80211_IFTYPE_AP_VLAN: VLAN interface for access points
- * @NL80211_IFTYPE_WDS: wireless distribution interface
- * @NL80211_IFTYPE_MONITOR: monitor interface receiving all frames
- * @NL80211_IFTYPE_MESH_POINT: mesh point
- * @NL80211_IFTYPE_P2P_CLIENT: P2P client
- * @NL80211_IFTYPE_P2P_GO: P2P group owner
- * @NL80211_IFTYPE_MAX: highest interface type number currently defined
- * @NUM_NL80211_IFTYPES: number of defined interface types
- *
- * These values are used with the %NL80211_ATTR_IFTYPE
- * to set the type of an interface.
- *
- */
-enum nl80211_iftype {
-	NL80211_IFTYPE_UNSPECIFIED,
-	NL80211_IFTYPE_ADHOC,
-	NL80211_IFTYPE_STATION,
-	NL80211_IFTYPE_AP,
-	NL80211_IFTYPE_AP_VLAN,
-	NL80211_IFTYPE_WDS,
-	NL80211_IFTYPE_MONITOR,
-	NL80211_IFTYPE_MESH_POINT,
-	NL80211_IFTYPE_P2P_CLIENT,
-	NL80211_IFTYPE_P2P_GO,
-
-	/* keep last */
-	NUM_NL80211_IFTYPES,
-	NL80211_IFTYPE_MAX = NUM_NL80211_IFTYPES - 1
-};
-
-/**
- * enum nl80211_sta_flags - station flags
- *
- * Station flags. When a station is added to an AP interface, it is
- * assumed to be already associated (and hence authenticated.)
- *
- * @__NL80211_STA_FLAG_INVALID: attribute number 0 is reserved
- * @NL80211_STA_FLAG_AUTHORIZED: station is authorized (802.1X)
- * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames
- *	with short barker preamble
- * @NL80211_STA_FLAG_WME: station is WME/QoS capable
- * @NL80211_STA_FLAG_MFP: station uses management frame protection
- * @NL80211_STA_FLAG_MAX: highest station flag number currently defined
- * @__NL80211_STA_FLAG_AFTER_LAST: internal use
- */
-enum nl80211_sta_flags {
-	__NL80211_STA_FLAG_INVALID,
-	NL80211_STA_FLAG_AUTHORIZED,
-	NL80211_STA_FLAG_SHORT_PREAMBLE,
-	NL80211_STA_FLAG_WME,
-	NL80211_STA_FLAG_MFP,
-
-	/* keep last */
-	__NL80211_STA_FLAG_AFTER_LAST,
-	NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
-};
-
-/**
- * struct nl80211_sta_flag_update - station flags mask/set
- * @mask: mask of station flags to set
- * @set: which values to set them to
- *
- * Both mask and set contain bits as per &enum nl80211_sta_flags.
- */
-struct nl80211_sta_flag_update {
-	__u32 mask;
-	__u32 set;
-} __attribute__((packed));
-
-/**
- * enum nl80211_rate_info - bitrate information
- *
- * These attribute types are used with %NL80211_STA_INFO_TXRATE
- * when getting information about the bitrate of a station.
- *
- * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
- * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
- * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate
- * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
- * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
- * @__NL80211_RATE_INFO_AFTER_LAST: internal use
- */
-enum nl80211_rate_info {
-	__NL80211_RATE_INFO_INVALID,
-	NL80211_RATE_INFO_BITRATE,
-	NL80211_RATE_INFO_MCS,
-	NL80211_RATE_INFO_40_MHZ_WIDTH,
-	NL80211_RATE_INFO_SHORT_GI,
-
-	/* keep last */
-	__NL80211_RATE_INFO_AFTER_LAST,
-	NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_sta_info - station information
- *
- * These attribute types are used with %NL80211_ATTR_STA_INFO
- * when getting information about a station.
- *
- * @__NL80211_STA_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)
- * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)
- * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
- * @__NL80211_STA_INFO_AFTER_LAST: internal
- * @NL80211_STA_INFO_MAX: highest possible station info attribute
- * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
- * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
- * 	containing info as possible, see &enum nl80211_sta_info_txrate.
- * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
- * @NL80211_STA_INFO_TX_PACKETS: total transmitted packets (u32, to this
- *	station)
- * @NL80211_STA_INFO_TX_RETRIES: total retries (u32, to this station)
- * @NL80211_STA_INFO_TX_FAILED: total failed packets (u32, to this station)
- */
-enum nl80211_sta_info {
-	__NL80211_STA_INFO_INVALID,
-	NL80211_STA_INFO_INACTIVE_TIME,
-	NL80211_STA_INFO_RX_BYTES,
-	NL80211_STA_INFO_TX_BYTES,
-	NL80211_STA_INFO_LLID,
-	NL80211_STA_INFO_PLID,
-	NL80211_STA_INFO_PLINK_STATE,
-	NL80211_STA_INFO_SIGNAL,
-	NL80211_STA_INFO_TX_BITRATE,
-	NL80211_STA_INFO_RX_PACKETS,
-	NL80211_STA_INFO_TX_PACKETS,
-	NL80211_STA_INFO_TX_RETRIES,
-	NL80211_STA_INFO_TX_FAILED,
-
-	/* keep last */
-	__NL80211_STA_INFO_AFTER_LAST,
-	NL80211_STA_INFO_MAX = __NL80211_STA_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mpath_flags - nl80211 mesh path flags
- *
- * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
- * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
- * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
- * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
- */
-enum nl80211_mpath_flags {
-	NL80211_MPATH_FLAG_ACTIVE =	1<<0,
-	NL80211_MPATH_FLAG_RESOLVING =	1<<1,
-	NL80211_MPATH_FLAG_SN_VALID =	1<<2,
-	NL80211_MPATH_FLAG_FIXED =	1<<3,
-	NL80211_MPATH_FLAG_RESOLVED =	1<<4,
-};
-
-/**
- * enum nl80211_mpath_info - mesh path information
- *
- * These attribute types are used with %NL80211_ATTR_MPATH_INFO when getting
- * information about a mesh path.
- *
- * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_MPATH_INFO_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_MPATH_INFO_SN: destination sequence number
- * @NL80211_MPATH_INFO_METRIC: metric (cost) of this mesh path
- * @NL80211_MPATH_INFO_EXPTIME: expiration time for the path, in msec from now
- * @NL80211_MPATH_INFO_FLAGS: mesh path flags, enumerated in
- * 	&enum nl80211_mpath_flags;
- * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
- * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
- * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
- *	currently defind
- * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
- */
-enum nl80211_mpath_info {
-	__NL80211_MPATH_INFO_INVALID,
-	NL80211_MPATH_INFO_FRAME_QLEN,
-	NL80211_MPATH_INFO_SN,
-	NL80211_MPATH_INFO_METRIC,
-	NL80211_MPATH_INFO_EXPTIME,
-	NL80211_MPATH_INFO_FLAGS,
-	NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,
-	NL80211_MPATH_INFO_DISCOVERY_RETRIES,
-
-	/* keep last */
-	__NL80211_MPATH_INFO_AFTER_LAST,
-	NL80211_MPATH_INFO_MAX = __NL80211_MPATH_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_band_attr - band attributes
- * @__NL80211_BAND_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BAND_ATTR_FREQS: supported frequencies in this band,
- *	an array of nested frequency attributes
- * @NL80211_BAND_ATTR_RATES: supported bitrates in this band,
- *	an array of nested bitrate attributes
- * @NL80211_BAND_ATTR_HT_MCS_SET: 16-byte attribute containing the MCS set as
- *	defined in 802.11n
- * @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
- * @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
- * @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
- * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined
- * @__NL80211_BAND_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_band_attr {
-	__NL80211_BAND_ATTR_INVALID,
-	NL80211_BAND_ATTR_FREQS,
-	NL80211_BAND_ATTR_RATES,
-
-	NL80211_BAND_ATTR_HT_MCS_SET,
-	NL80211_BAND_ATTR_HT_CAPA,
-	NL80211_BAND_ATTR_HT_AMPDU_FACTOR,
-	NL80211_BAND_ATTR_HT_AMPDU_DENSITY,
-
-	/* keep last */
-	__NL80211_BAND_ATTR_AFTER_LAST,
-	NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
-
-/**
- * enum nl80211_frequency_attr - frequency attributes
- * @__NL80211_FREQUENCY_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
- * @NL80211_FREQUENCY_ATTR_DISABLED: Channel is disabled in current
- *	regulatory domain.
- * @NL80211_FREQUENCY_ATTR_PASSIVE_SCAN: Only passive scanning is
- *	permitted on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_NO_IBSS: IBSS networks are not permitted
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
- *	on this channel in current regulatory domain.
- * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
- *	(100 * dBm).
- * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
- *	currently defined
- * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_frequency_attr {
-	__NL80211_FREQUENCY_ATTR_INVALID,
-	NL80211_FREQUENCY_ATTR_FREQ,
-	NL80211_FREQUENCY_ATTR_DISABLED,
-	NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
-	NL80211_FREQUENCY_ATTR_NO_IBSS,
-	NL80211_FREQUENCY_ATTR_RADAR,
-	NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
-
-	/* keep last */
-	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
-	NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
-};
-
-#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
-
-/**
- * enum nl80211_bitrate_attr - bitrate attributes
- * @__NL80211_BITRATE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_BITRATE_ATTR_RATE: Bitrate in units of 100 kbps
- * @NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE: Short preamble supported
- *	in 2.4 GHz band.
- * @NL80211_BITRATE_ATTR_MAX: highest bitrate attribute number
- *	currently defined
- * @__NL80211_BITRATE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_bitrate_attr {
-	__NL80211_BITRATE_ATTR_INVALID,
-	NL80211_BITRATE_ATTR_RATE,
-	NL80211_BITRATE_ATTR_2GHZ_SHORTPREAMBLE,
-
-	/* keep last */
-	__NL80211_BITRATE_ATTR_AFTER_LAST,
-	NL80211_BITRATE_ATTR_MAX = __NL80211_BITRATE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_initiator - Indicates the initiator of a reg domain request
- * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the
- * 	regulatory domain.
- * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the
- * 	wireless core it thinks its knows the regulatory domain we should be in.
- * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
- * 	802.11 country information element with regulatory information it
- * 	thinks we should consider.
- */
-enum nl80211_reg_initiator {
-	NL80211_REGDOM_SET_BY_CORE,
-	NL80211_REGDOM_SET_BY_USER,
-	NL80211_REGDOM_SET_BY_DRIVER,
-	NL80211_REGDOM_SET_BY_COUNTRY_IE,
-};
-
-/**
- * enum nl80211_reg_type - specifies the type of regulatory domain
- * @NL80211_REGDOM_TYPE_COUNTRY: the regulatory domain set is one that pertains
- *	to a specific country. When this is set you can count on the
- *	ISO / IEC 3166 alpha2 country code being valid.
- * @NL80211_REGDOM_TYPE_WORLD: the regulatory set domain is the world regulatory
- * 	domain.
- * @NL80211_REGDOM_TYPE_CUSTOM_WORLD: the regulatory domain set is a custom
- * 	driver specific world regulatory domain. These do not apply system-wide
- * 	and are only applicable to the individual devices which have requested
- * 	them to be applied.
- * @NL80211_REGDOM_TYPE_INTERSECTION: the regulatory domain set is the product
- *	of an intersection between two regulatory domains -- the previously
- *	set regulatory domain on the system and the last accepted regulatory
- *	domain request to be processed.
- */
-enum nl80211_reg_type {
-	NL80211_REGDOM_TYPE_COUNTRY,
-	NL80211_REGDOM_TYPE_WORLD,
-	NL80211_REGDOM_TYPE_CUSTOM_WORLD,
-	NL80211_REGDOM_TYPE_INTERSECTION,
-};
-
-/**
- * enum nl80211_reg_rule_attr - regulatory rule attributes
- * @__NL80211_REG_RULE_ATTR_INVALID: attribute number 0 is reserved
- * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional
- * 	considerations for a given frequency range. These are the
- * 	&enum nl80211_reg_rule_flags.
- * @NL80211_ATTR_FREQ_RANGE_START: starting frequencry for the regulatory
- * 	rule in KHz. This is not a center of frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_END: ending frequency for the regulatory rule
- * 	in KHz. This is not a center a frequency but an actual regulatory
- * 	band edge.
- * @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this
- * 	frequency range, in KHz.
- * @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain
- * 	for a given frequency range. The value is in mBi (100 * dBi).
- * 	If you don't have one then don't send this.
- * @NL80211_ATTR_POWER_RULE_MAX_EIRP: the maximum allowed EIRP for
- * 	a given frequency range. The value is in mBm (100 * dBm).
- * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number
- *	currently defined
- * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_reg_rule_attr {
-	__NL80211_REG_RULE_ATTR_INVALID,
-	NL80211_ATTR_REG_RULE_FLAGS,
-
-	NL80211_ATTR_FREQ_RANGE_START,
-	NL80211_ATTR_FREQ_RANGE_END,
-	NL80211_ATTR_FREQ_RANGE_MAX_BW,
-
-	NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN,
-	NL80211_ATTR_POWER_RULE_MAX_EIRP,
-
-	/* keep last */
-	__NL80211_REG_RULE_ATTR_AFTER_LAST,
-	NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_reg_rule_flags - regulatory rule flags
- *
- * @NL80211_RRF_NO_OFDM: OFDM modulation not allowed
- * @NL80211_RRF_NO_CCK: CCK modulation not allowed
- * @NL80211_RRF_NO_INDOOR: indoor operation not allowed
- * @NL80211_RRF_NO_OUTDOOR: outdoor operation not allowed
- * @NL80211_RRF_DFS: DFS support is required to be used
- * @NL80211_RRF_PTP_ONLY: this is only for Point To Point links
- * @NL80211_RRF_PTMP_ONLY: this is only for Point To Multi Point links
- * @NL80211_RRF_PASSIVE_SCAN: passive scan is required
- * @NL80211_RRF_NO_IBSS: no IBSS is allowed
- */
-enum nl80211_reg_rule_flags {
-	NL80211_RRF_NO_OFDM		= 1<<0,
-	NL80211_RRF_NO_CCK		= 1<<1,
-	NL80211_RRF_NO_INDOOR		= 1<<2,
-	NL80211_RRF_NO_OUTDOOR		= 1<<3,
-	NL80211_RRF_DFS			= 1<<4,
-	NL80211_RRF_PTP_ONLY		= 1<<5,
-	NL80211_RRF_PTMP_ONLY		= 1<<6,
-	NL80211_RRF_PASSIVE_SCAN	= 1<<7,
-	NL80211_RRF_NO_IBSS		= 1<<8,
-};
-
-/**
- * enum nl80211_survey_info - survey information
- *
- * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
- * when getting information about a survey.
- *
- * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
- * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
- * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
- * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
- * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
- *	spent on this channel
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
- *	channel was sensed busy (either due to activity or energy detect)
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
- *	channel was sensed busy
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
- *	receiving data
- * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
- *	transmitting data
- * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
- *	currently defined
- * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
- */
-enum nl80211_survey_info {
-	__NL80211_SURVEY_INFO_INVALID,
-	NL80211_SURVEY_INFO_FREQUENCY,
-	NL80211_SURVEY_INFO_NOISE,
-	NL80211_SURVEY_INFO_IN_USE,
-	NL80211_SURVEY_INFO_CHANNEL_TIME,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
-	NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
-
-	/* keep last */
-	__NL80211_SURVEY_INFO_AFTER_LAST,
-	NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_mntr_flags - monitor configuration flags
- *
- * Monitor configuration flags.
- *
- * @__NL80211_MNTR_FLAG_INVALID: reserved
- *
- * @NL80211_MNTR_FLAG_FCSFAIL: pass frames with bad FCS
- * @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP
- * @NL80211_MNTR_FLAG_CONTROL: pass control frames
- * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
- * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
- *	overrides all other flags.
- *
- * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
- * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
- */
-enum nl80211_mntr_flags {
-	__NL80211_MNTR_FLAG_INVALID,
-	NL80211_MNTR_FLAG_FCSFAIL,
-	NL80211_MNTR_FLAG_PLCPFAIL,
-	NL80211_MNTR_FLAG_CONTROL,
-	NL80211_MNTR_FLAG_OTHER_BSS,
-	NL80211_MNTR_FLAG_COOK_FRAMES,
-
-	/* keep last */
-	__NL80211_MNTR_FLAG_AFTER_LAST,
-	NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_meshconf_params - mesh configuration parameters
- *
- * Mesh configuration parameters
- *
- * @__NL80211_MESHCONF_INVALID: internal use
- *
- * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
- * millisecond units, used by the Peer Link Open message
- *
- * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the inital confirm timeout, in
- * millisecond units, used by the peer link management to close a peer link
- *
- * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
- * millisecond units
- *
- * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
- * on this mesh interface
- *
- * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
- * open retries that can be sent to establish a new peer link instance in a
- * mesh
- *
- * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
- * point.
- *
- * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
- * open peer links when we detect compatible mesh peers.
- *
- * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
- * containing a PREQ that an MP can send to a particular destination (path
- * target)
- *
- * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
- * (in milliseconds)
- *
- * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
- * until giving up on a path discovery (in milliseconds)
- *
- * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
- * points receiving a PREQ shall consider the forwarding information from the
- * root to be valid. (TU = time unit)
- *
- * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
- * TUs) during which an MP can send only one action frame containing a PREQ
- * reference element
- *
- * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
- * that it takes for an HWMP information element to propagate across the mesh
- *
- * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
- *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
- *
- * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
- */
-enum nl80211_meshconf_params {
-	__NL80211_MESHCONF_INVALID,
-	NL80211_MESHCONF_RETRY_TIMEOUT,
-	NL80211_MESHCONF_CONFIRM_TIMEOUT,
-	NL80211_MESHCONF_HOLDING_TIMEOUT,
-	NL80211_MESHCONF_MAX_PEER_LINKS,
-	NL80211_MESHCONF_MAX_RETRIES,
-	NL80211_MESHCONF_TTL,
-	NL80211_MESHCONF_AUTO_OPEN_PLINKS,
-	NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
-	NL80211_MESHCONF_PATH_REFRESH_TIME,
-	NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
-	NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
-	NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
-	NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
-	NL80211_MESHCONF_HWMP_ROOTMODE,
-
-	/* keep last */
-	__NL80211_MESHCONF_ATTR_AFTER_LAST,
-	NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_txq_attr - TX queue parameter attributes
- * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
- * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)
- * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
- *	disabled
- * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form
- *	2^n-1 in the range 1..32767]
- * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]
- * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
- * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number
- */
-enum nl80211_txq_attr {
-	__NL80211_TXQ_ATTR_INVALID,
-	NL80211_TXQ_ATTR_QUEUE,
-	NL80211_TXQ_ATTR_TXOP,
-	NL80211_TXQ_ATTR_CWMIN,
-	NL80211_TXQ_ATTR_CWMAX,
-	NL80211_TXQ_ATTR_AIFS,
-
-	/* keep last */
-	__NL80211_TXQ_ATTR_AFTER_LAST,
-	NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
-};
-
-enum nl80211_txq_q {
-	NL80211_TXQ_Q_VO,
-	NL80211_TXQ_Q_VI,
-	NL80211_TXQ_Q_BE,
-	NL80211_TXQ_Q_BK
-};
-
-enum nl80211_channel_type {
-	NL80211_CHAN_NO_HT,
-	NL80211_CHAN_HT20,
-	NL80211_CHAN_HT40MINUS,
-	NL80211_CHAN_HT40PLUS
-};
-
-/**
- * enum nl80211_bss - netlink attributes for a BSS
- *
- * @__NL80211_BSS_INVALID: invalid
- * @NL80211_BSS_BSSID: BSSID of the BSS (6 octets)
- * @NL80211_BSS_FREQUENCY: frequency in MHz (u32)
- * @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64)
- * @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16)
- * @NL80211_BSS_CAPABILITY: capability field (CPU order, u16)
- * @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the
- *	raw information elements from the probe response/beacon (bin);
- *	if the %NL80211_BSS_BEACON_IES attribute is present, the IEs here are
- *	from a Probe Response frame; otherwise they are from a Beacon frame.
- *	However, if the driver does not indicate the source of the IEs, these
- *	IEs may be from either frame subtype.
- * @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon
- *	in mBm (100 * dBm) (s32)
- * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
- *	in unspecified units, scaled to 0..100 (u8)
- * @NL80211_BSS_STATUS: status, if this BSS is "used"
- * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms
- * @NL80211_BSS_BEACON_IES: binary attribute containing the raw information
- *	elements from a Beacon frame (bin); not present if no Beacon frame has
- *	yet been received
- * @__NL80211_BSS_AFTER_LAST: internal
- * @NL80211_BSS_MAX: highest BSS attribute
- */
-enum nl80211_bss {
-	__NL80211_BSS_INVALID,
-	NL80211_BSS_BSSID,
-	NL80211_BSS_FREQUENCY,
-	NL80211_BSS_TSF,
-	NL80211_BSS_BEACON_INTERVAL,
-	NL80211_BSS_CAPABILITY,
-	NL80211_BSS_INFORMATION_ELEMENTS,
-	NL80211_BSS_SIGNAL_MBM,
-	NL80211_BSS_SIGNAL_UNSPEC,
-	NL80211_BSS_STATUS,
-	NL80211_BSS_SEEN_MS_AGO,
-	NL80211_BSS_BEACON_IES,
-
-	/* keep last */
-	__NL80211_BSS_AFTER_LAST,
-	NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_bss_status - BSS "status"
- * @NL80211_BSS_STATUS_AUTHENTICATED: Authenticated with this BSS.
- * @NL80211_BSS_STATUS_ASSOCIATED: Associated with this BSS.
- * @NL80211_BSS_STATUS_IBSS_JOINED: Joined to this IBSS.
- *
- * The BSS status is a BSS attribute in scan dumps, which
- * indicates the status the interface has wrt. this BSS.
- */
-enum nl80211_bss_status {
-	NL80211_BSS_STATUS_AUTHENTICATED,
-	NL80211_BSS_STATUS_ASSOCIATED,
-	NL80211_BSS_STATUS_IBSS_JOINED,
-};
-
-/**
- * enum nl80211_auth_type - AuthenticationType
- *
- * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
- * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
- * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
- * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
- * @__NL80211_AUTHTYPE_NUM: internal
- * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
- * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
- *	trying multiple times); this is invalid in netlink -- leave out
- *	the attribute for this on CONNECT commands.
- */
-enum nl80211_auth_type {
-	NL80211_AUTHTYPE_OPEN_SYSTEM,
-	NL80211_AUTHTYPE_SHARED_KEY,
-	NL80211_AUTHTYPE_FT,
-	NL80211_AUTHTYPE_NETWORK_EAP,
-
-	/* keep last */
-	__NL80211_AUTHTYPE_NUM,
-	NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
-	NL80211_AUTHTYPE_AUTOMATIC
-};
-
-/**
- * enum nl80211_key_type - Key Type
- * @NL80211_KEYTYPE_GROUP: Group (broadcast/multicast) key
- * @NL80211_KEYTYPE_PAIRWISE: Pairwise (unicast/individual) key
- * @NL80211_KEYTYPE_PEERKEY: PeerKey (DLS)
- * @NUM_NL80211_KEYTYPES: number of defined key types
- */
-enum nl80211_key_type {
-	NL80211_KEYTYPE_GROUP,
-	NL80211_KEYTYPE_PAIRWISE,
-	NL80211_KEYTYPE_PEERKEY,
-
-	NUM_NL80211_KEYTYPES
-};
-
-/**
- * enum nl80211_mfp - Management frame protection state
- * @NL80211_MFP_NO: Management frame protection not used
- * @NL80211_MFP_REQUIRED: Management frame protection required
- */
-enum nl80211_mfp {
-	NL80211_MFP_NO,
-	NL80211_MFP_REQUIRED,
-};
-
-enum nl80211_wpa_versions {
-	NL80211_WPA_VERSION_1 = 1 << 0,
-	NL80211_WPA_VERSION_2 = 1 << 1,
-};
-
-/**
- * enum nl80211_key_attributes - key attributes
- * @__NL80211_KEY_INVALID: invalid
- * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of
- *	16 bytes encryption key followed by 8 bytes each for TX and RX MIC
- *	keys
- * @NL80211_KEY_IDX: key ID (u8, 0-3)
- * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
- *	section 7.3.2.25.1, e.g. 0x000FAC04)
- * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
- *	CCMP keys, each six bytes in little endian
- * @NL80211_KEY_DEFAULT: flag indicating default key
- * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key
- * @NL80211_KEY_TYPE: the key type from enum nl80211_key_type, if not
- *	specified the default depends on whether a MAC address was
- *	given with the command using the key or not (u32)
- * @__NL80211_KEY_AFTER_LAST: internal
- * @NL80211_KEY_MAX: highest key attribute
- */
-enum nl80211_key_attributes {
-	__NL80211_KEY_INVALID,
-	NL80211_KEY_DATA,
-	NL80211_KEY_IDX,
-	NL80211_KEY_CIPHER,
-	NL80211_KEY_SEQ,
-	NL80211_KEY_DEFAULT,
-	NL80211_KEY_DEFAULT_MGMT,
-	NL80211_KEY_TYPE,
-
-	/* keep last */
-	__NL80211_KEY_AFTER_LAST,
-	NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_tx_rate_attributes - TX rate set attributes
- * @__NL80211_TXRATE_INVALID: invalid
- * @NL80211_TXRATE_LEGACY: Legacy (non-MCS) rates allowed for TX rate selection
- *	in an array of rates as defined in IEEE 802.11 7.3.2.2 (u8 values with
- *	1 = 500 kbps) but without the IE length restriction (at most
- *	%NL80211_MAX_SUPP_RATES in a single array).
- * @__NL80211_TXRATE_AFTER_LAST: internal
- * @NL80211_TXRATE_MAX: highest TX rate attribute
- */
-enum nl80211_tx_rate_attributes {
-	__NL80211_TXRATE_INVALID,
-	NL80211_TXRATE_LEGACY,
-
-	/* keep last */
-	__NL80211_TXRATE_AFTER_LAST,
-	NL80211_TXRATE_MAX = __NL80211_TXRATE_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_band - Frequency band
- * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
- * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
- */
-enum nl80211_band {
-	NL80211_BAND_2GHZ,
-	NL80211_BAND_5GHZ,
-};
-
-enum nl80211_ps_state {
-	NL80211_PS_DISABLED,
-	NL80211_PS_ENABLED,
-};
-
-/**
- * enum nl80211_attr_cqm - connection quality monitor attributes
- * @__NL80211_ATTR_CQM_INVALID: invalid
- * @NL80211_ATTR_CQM_RSSI_THOLD: RSSI threshold in dBm. This value specifies
- *	the threshold for the RSSI level at which an event will be sent. Zero
- *	to disable.
- * @NL80211_ATTR_CQM_RSSI_HYST: RSSI hysteresis in dBm. This value specifies
- *	the minimum amount the RSSI level must change after an event before a
- *	new event may be issued (to reduce effects of RSSI oscillation).
- * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
- * @__NL80211_ATTR_CQM_AFTER_LAST: internal
- * @NL80211_ATTR_CQM_MAX: highest key attribute
- */
-enum nl80211_attr_cqm {
-	__NL80211_ATTR_CQM_INVALID,
-	NL80211_ATTR_CQM_RSSI_THOLD,
-	NL80211_ATTR_CQM_RSSI_HYST,
-	NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
-
-	/* keep last */
-	__NL80211_ATTR_CQM_AFTER_LAST,
-	NL80211_ATTR_CQM_MAX = __NL80211_ATTR_CQM_AFTER_LAST - 1
-};
-
-/**
- * enum nl80211_cqm_rssi_threshold_event - RSSI threshold event
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW: The RSSI level is lower than the
- *      configured threshold
- * @NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH: The RSSI is higher than the
- *      configured threshold
- */
-enum nl80211_cqm_rssi_threshold_event {
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,
-	NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,
-};
-
-
-/**
- * enum nl80211_tx_power_setting - TX power adjustment
- * @NL80211_TX_POWER_AUTOMATIC: automatically determine transmit power
- * @NL80211_TX_POWER_LIMITED: limit TX power by the mBm parameter
- * @NL80211_TX_POWER_FIXED: fix TX power to the mBm parameter
- */
-enum nl80211_tx_power_setting {
-	NL80211_TX_POWER_AUTOMATIC,
-	NL80211_TX_POWER_LIMITED,
-	NL80211_TX_POWER_FIXED,
-};
-
-#endif /* __LINUX_NL80211_H */
diff --git a/contrib/package/iwinfo/src/include/iwinfo/api/wext.h b/contrib/package/iwinfo/src/include/iwinfo/api/wext.h
deleted file mode 100644
index 6b5838e1b..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/api/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/contrib/package/iwinfo/src/include/iwinfo/lua.h b/contrib/package/iwinfo/src/include/iwinfo/lua.h
deleted file mode 100644
index 65a3a5cb9..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/lua.h
+++ /dev/null
@@ -1,81 +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
-
-#ifdef USE_NL80211
-#define IWINFO_NL80211_META	"iwinfo.nl80211"
-#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/contrib/package/iwinfo/src/include/iwinfo/madwifi.h b/contrib/package/iwinfo/src/include/iwinfo/madwifi.h
deleted file mode 100644
index 4de48557d..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/madwifi.h
+++ /dev/null
@@ -1,75 +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 <fcntl.h>
-
-#include "iwinfo.h"
-#include "iwinfo/utils.h"
-#include "iwinfo/api/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_country(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_txpower(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_encryption(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_countrylist(const char *ifname, char *buf, int *len);
-int madwifi_get_hwmodelist(const char *ifname, int *buf);
-int madwifi_get_mbssid_support(const char *ifname, int *buf);
-void madwifi_close(void);
-
-static const struct iwinfo_ops madwifi_ops = {
-	.channel        = madwifi_get_channel,
-	.frequency      = madwifi_get_frequency,
-	.txpower        = madwifi_get_txpower,
-	.bitrate        = madwifi_get_bitrate,
-	.signal         = madwifi_get_signal,
-	.noise          = madwifi_get_noise,
-	.quality        = madwifi_get_quality,
-	.quality_max    = madwifi_get_quality_max,
-	.mbssid_support = madwifi_get_mbssid_support,
-	.hwmodelist     = madwifi_get_hwmodelist,
-	.mode           = madwifi_get_mode,
-	.ssid           = madwifi_get_ssid,
-	.bssid          = madwifi_get_bssid,
-	.country        = madwifi_get_country,
-	.encryption     = madwifi_get_encryption,
-	.assoclist      = madwifi_get_assoclist,
-	.txpwrlist      = madwifi_get_txpwrlist,
-	.scanlist       = madwifi_get_scanlist,
-	.freqlist       = madwifi_get_freqlist,
-	.countrylist    = madwifi_get_countrylist,
-	.close          = madwifi_close
-};
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/nl80211.h b/contrib/package/iwinfo/src/include/iwinfo/nl80211.h
deleted file mode 100644
index dce508cf0..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/nl80211.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - NL80211 Headers
- *
- *   Copyright (C) 2010 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_NL80211_H_
-#define __IWINFO_NL80211_H_
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include <signal.h>
-#include <sys/un.h>
-#include <netlink/netlink.h>
-#include <netlink/genl/genl.h>
-#include <netlink/genl/family.h>
-#include <netlink/genl/ctrl.h>
-
-#include "iwinfo.h"
-#include "iwinfo/utils.h"
-#include "iwinfo/api/nl80211.h"
-
-struct nl80211_state {
-	struct nl_sock *nl_sock;
-	struct nl_cache *nl_cache;
-	struct genl_family *nl80211;
-};
-
-struct nl80211_msg_conveyor {
-	struct nl_msg *msg;
-	struct nl_cb *cb;
-};
-
-struct nl80211_rssi_rate {
-	int16_t rate;
-	int8_t  rssi;
-};
-
-struct nl80211_array_buf {
-	void *buf;
-	int count;
-};
-
-int nl80211_probe(const char *ifname);
-int nl80211_get_mode(const char *ifname, char *buf);
-int nl80211_get_ssid(const char *ifname, char *buf);
-int nl80211_get_bssid(const char *ifname, char *buf);
-int nl80211_get_country(const char *ifname, char *buf);
-int nl80211_get_channel(const char *ifname, int *buf);
-int nl80211_get_frequency(const char *ifname, int *buf);
-int nl80211_get_txpower(const char *ifname, int *buf);
-int nl80211_get_bitrate(const char *ifname, int *buf);
-int nl80211_get_signal(const char *ifname, int *buf);
-int nl80211_get_noise(const char *ifname, int *buf);
-int nl80211_get_quality(const char *ifname, int *buf);
-int nl80211_get_quality_max(const char *ifname, int *buf);
-int nl80211_get_encryption(const char *ifname, char *buf);
-int nl80211_get_assoclist(const char *ifname, char *buf, int *len);
-int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len);
-int nl80211_get_scanlist(const char *ifname, char *buf, int *len);
-int nl80211_get_freqlist(const char *ifname, char *buf, int *len);
-int nl80211_get_countrylist(const char *ifname, char *buf, int *len);
-int nl80211_get_hwmodelist(const char *ifname, int *buf);
-int nl80211_get_mbssid_support(const char *ifname, int *buf);
-void nl80211_close(void);
-
-static const struct iwinfo_ops nl80211_ops = {
-	.channel        = nl80211_get_channel,
-	.frequency      = nl80211_get_frequency,
-	.txpower        = nl80211_get_txpower,
-	.bitrate        = nl80211_get_bitrate,
-	.signal         = nl80211_get_signal,
-	.noise          = nl80211_get_noise,
-	.quality        = nl80211_get_quality,
-	.quality_max    = nl80211_get_quality_max,
-	.mbssid_support = nl80211_get_mbssid_support,
-	.hwmodelist     = nl80211_get_hwmodelist,
-	.mode           = nl80211_get_mode,
-	.ssid           = nl80211_get_ssid,
-	.bssid          = nl80211_get_bssid,
-	.country        = nl80211_get_country,
-	.encryption     = nl80211_get_encryption,
-	.assoclist      = nl80211_get_assoclist,
-	.txpwrlist      = nl80211_get_txpwrlist,
-	.scanlist       = nl80211_get_scanlist,
-	.freqlist       = nl80211_get_freqlist,
-	.countrylist    = nl80211_get_countrylist,
-	.close          = nl80211_close
-};
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/utils.h b/contrib/package/iwinfo/src/include/iwinfo/utils.h
deleted file mode 100644
index 57958b1b5..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/utils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Utility Headers
- *
- *   Copyright (C) 2010 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_UTILS_H_
-#define __IWINFO_UTILS_H_
-
-#include <sys/socket.h>
-#include <net/if.h>
-
-#include "iwinfo.h"
-
-#define LOG10_MAGIC	1.25892541179
-
-int iwinfo_ioctl(int cmd, void *ifr);
-
-int iwinfo_dbm2mw(int in);
-int iwinfo_mw2dbm(int in);
-
-int iwinfo_ifup(const char *ifname);
-int iwinfo_ifdown(const char *ifname);
-int iwinfo_ifmac(const char *ifname);
-
-void iwinfo_close(void);
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/wext.h b/contrib/package/iwinfo/src/include/iwinfo/wext.h
deleted file mode 100644
index 69b7a8e3d..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/wext.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Headers
- *
- *   Copyright (C) 2009-2010 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 <fcntl.h>
-
-#include "iwinfo.h"
-#include "iwinfo/utils.h"
-#include "iwinfo/api/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_country(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_txpower(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_encryption(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_countrylist(const char *ifname, char *buf, int *len);
-int wext_get_hwmodelist(const char *ifname, int *buf);
-int wext_get_mbssid_support(const char *ifname, int *buf);
-void wext_close(void);
-
-static const struct iwinfo_ops wext_ops = {
-	.channel        = wext_get_channel,
-	.frequency      = wext_get_frequency,
-	.txpower        = wext_get_txpower,
-	.bitrate        = wext_get_bitrate,
-	.signal         = wext_get_signal,
-	.noise          = wext_get_noise,
-	.quality        = wext_get_quality,
-	.quality_max    = wext_get_quality_max,
-	.mbssid_support = wext_get_mbssid_support,
-	.hwmodelist     = wext_get_hwmodelist,
-	.mode           = wext_get_mode,
-	.ssid           = wext_get_ssid,
-	.bssid          = wext_get_bssid,
-	.country        = wext_get_country,
-	.encryption     = wext_get_encryption,
-	.assoclist      = wext_get_assoclist,
-	.txpwrlist      = wext_get_txpwrlist,
-	.scanlist       = wext_get_scanlist,
-	.freqlist       = wext_get_freqlist,
-	.countrylist    = wext_get_countrylist,
-	.close          = wext_close
-};
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/wext_scan.h b/contrib/package/iwinfo/src/include/iwinfo/wext_scan.h
deleted file mode 100644
index 085c65310..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/wext_scan.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Headers
- *
- *   Copyright (C) 2009-2010 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 <fcntl.h>
-
-#include "iwinfo.h"
-#include "iwinfo/utils.h"
-#include "iwinfo/api/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));
-
-#define	IW_IE_CYPHER_NUM	8
-#define	IW_IE_KEY_MGMT_NUM	3
-
-#endif
diff --git a/contrib/package/iwinfo/src/include/iwinfo/wl.h b/contrib/package/iwinfo/src/include/iwinfo/wl.h
deleted file mode 100644
index e931f7c6e..000000000
--- a/contrib/package/iwinfo/src/include/iwinfo/wl.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Broadcom wl.o Headers
- *
- *   Copyright (C) 2009-2010 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 <fcntl.h>
-
-#include "iwinfo.h"
-#include "iwinfo/utils.h"
-#include "iwinfo/api/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_country(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_txpower(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_encryption(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_countrylist(const char *ifname, char *buf, int *len);
-int wl_get_hwmodelist(const char *ifname, int *buf);
-int wl_get_mbssid_support(const char *ifname, int *buf);
-void wl_close(void);
-
-static const struct iwinfo_ops wl_ops = {
-	.channel        = wl_get_channel,
-	.frequency      = wl_get_frequency,
-	.txpower        = wl_get_txpower,
-	.bitrate        = wl_get_bitrate,
-	.signal         = wl_get_signal,
-	.noise          = wl_get_noise,
-	.quality        = wl_get_quality,
-	.quality_max    = wl_get_quality_max,
-	.mbssid_support = wl_get_mbssid_support,
-	.hwmodelist     = wl_get_hwmodelist,
-	.mode           = wl_get_mode,
-	.ssid           = wl_get_ssid,
-	.bssid          = wl_get_bssid,
-	.country        = wl_get_country,
-	.encryption     = wl_get_encryption,
-	.assoclist      = wl_get_assoclist,
-	.txpwrlist      = wl_get_txpwrlist,
-	.scanlist       = wl_get_scanlist,
-	.freqlist       = wl_get_freqlist,
-	.countrylist    = wl_get_countrylist,
-	.close          = wl_close
-};
-
-#endif
diff --git a/contrib/package/iwinfo/src/iwinfo_cli.c b/contrib/package/iwinfo/src/iwinfo_cli.c
deleted file mode 100644
index 4229b19f5..000000000
--- a/contrib/package/iwinfo/src/iwinfo_cli.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Command line frontend
- *
- *   Copyright (C) 2011 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 <stdio.h>
-
-#include "iwinfo.h"
-
-
-static char * format_bssid(unsigned char *mac)
-{
-	static char buf[18];
-
-	snprintf(buf, sizeof(buf), "%02X:%02X:%02X:%02X:%02X:%02X",
-		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-
-	return buf;
-}
-
-static char * format_ssid(char *ssid)
-{
-	static char buf[IWINFO_ESSID_MAX_SIZE+3];
-
-	if (ssid && ssid[0])
-		snprintf(buf, sizeof(buf), "\"%s\"", ssid);
-	else
-		snprintf(buf, sizeof(buf), "unknown");
-
-	return buf;
-}
-
-static char * format_channel(int ch)
-{
-	static char buf[8];
-
-	if (ch <= 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d", ch);
-
-	return buf;
-}
-
-static char * format_frequency(int freq)
-{
-	static char buf[10];
-
-	if (freq <= 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%.3f GHz", ((float)freq / 1000.0));
-
-	return buf;
-}
-
-static char * format_txpower(int pwr)
-{
-	static char buf[10];
-
-	if (pwr < 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d dBm", pwr);
-
-	return buf;
-}
-
-static char * format_quality(int qual)
-{
-	static char buf[8];
-
-	if (qual < 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d", qual);
-
-	return buf;
-}
-
-static char * format_quality_max(int qmax)
-{
-	static char buf[8];
-
-	if (qmax < 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d", qmax);
-
-	return buf;
-}
-
-static char * format_signal(int sig)
-{
-	static char buf[10];
-
-	if (!sig)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d dBm", sig);
-
-	return buf;
-}
-
-static char * format_noise(int noise)
-{
-	static char buf[10];
-
-	if (!noise)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%d dBm", noise);
-
-	return buf;
-}
-
-static char * format_rate(int rate)
-{
-	static char buf[14];
-
-	if (rate <= 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "%.1f MBit/s", ((float)rate / 1000.0));
-
-	return buf;
-}
-
-static char * format_enc_ciphers(int ciphers)
-{
-	static char str[128] = { 0 };
-	char *pos = str;
-
-	if (ciphers & IWINFO_CIPHER_WEP40)
-		pos += sprintf(pos, "WEP-40, ");
-
-	if (ciphers & IWINFO_CIPHER_WEP104)
-		pos += sprintf(pos, "WEP-104, ");
-
-	if (ciphers & IWINFO_CIPHER_TKIP)
-		pos += sprintf(pos, "TKIP, ");
-
-	if (ciphers & IWINFO_CIPHER_CCMP)
-		pos += sprintf(pos, "CCMP, ");
-
-	if (ciphers & IWINFO_CIPHER_WRAP)
-		pos += sprintf(pos, "WRAP, ");
-
-	if (ciphers & IWINFO_CIPHER_AESOCB)
-		pos += sprintf(pos, "AES-OCB, ");
-
-	if (ciphers & IWINFO_CIPHER_CKIP)
-		pos += sprintf(pos, "CKIP, ");
-
-	if (!ciphers || (ciphers & IWINFO_CIPHER_NONE))
-		pos += sprintf(pos, "NONE, ");
-
-	*(pos - 2) = 0;
-
-	return str;
-}
-
-static char * format_enc_suites(int suites)
-{
-	static char str[64] = { 0 };
-	char *pos = str;
-
-	if (suites & IWINFO_KMGMT_PSK)
-		pos += sprintf(pos, "PSK/");
-
-	if (suites & IWINFO_KMGMT_8021x)
-		pos += sprintf(pos, "802.1X/");
-
-	if (!suites || (suites & IWINFO_KMGMT_NONE))
-		pos += sprintf(pos, "NONE/");
-
-	*(pos - 1) = 0;
-
-	return str;
-}
-
-static char * format_encryption(struct iwinfo_crypto_entry *c)
-{
-	static char buf[512];
-
-	if (!c)
-	{
-		snprintf(buf, sizeof(buf), "unknown");
-	}
-	else if (c->enabled)
-	{
-		/* WEP */
-		if (c->auth_algs && !c->wpa_version)
-		{
-			if ((c->auth_algs & IWINFO_AUTH_OPEN) &&
-				(c->auth_algs & IWINFO_AUTH_SHARED))
-			{
-				snprintf(buf, sizeof(buf), "WEP Open/Shared (%s)",
-					format_enc_ciphers(c->pair_ciphers));
-			}
-			else if (c->auth_algs & IWINFO_AUTH_OPEN)
-			{
-				snprintf(buf, sizeof(buf), "WEP Open System (%s)",
-					format_enc_ciphers(c->pair_ciphers));
-			}
-			else if (c->auth_algs & IWINFO_AUTH_SHARED)
-			{
-				snprintf(buf, sizeof(buf), "WEP Shared Auth (%s)",
-					format_enc_ciphers(c->pair_ciphers));
-			}
-		}
-
-		/* WPA */
-		else if (c->wpa_version)
-		{
-			switch (c->wpa_version) {
-				case 3:
-					snprintf(buf, sizeof(buf), "mixed WPA/WPA2 %s (%s)",
-						format_enc_suites(c->auth_suites),
-						format_enc_ciphers(c->pair_ciphers & c->group_ciphers));
-					break;
-
-				case 2:
-					snprintf(buf, sizeof(buf), "WPA2 %s (%s)",
-						format_enc_suites(c->auth_suites),
-						format_enc_ciphers(c->pair_ciphers & c->group_ciphers));
-					break;
-
-				case 1:
-					snprintf(buf, sizeof(buf), "WPA %s (%s)",
-						format_enc_suites(c->auth_suites),
-						format_enc_ciphers(c->pair_ciphers & c->group_ciphers));
-					break;
-			}
-		}
-		else
-		{
-			snprintf(buf, sizeof(buf), "none");
-		}
-	}
-	else
-	{
-		snprintf(buf, sizeof(buf), "none");
-	}
-
-	return buf;
-}
-
-static char * format_hwmodes(int modes)
-{
-	static char buf[12];
-
-	if (modes <= 0)
-		snprintf(buf, sizeof(buf), "unknown");
-	else
-		snprintf(buf, sizeof(buf), "802.11%s%s%s%s",
-			(modes & IWINFO_80211_A) ? "a" : "",
-			(modes & IWINFO_80211_B) ? "b" : "",
-			(modes & IWINFO_80211_G) ? "g" : "",
-			(modes & IWINFO_80211_N) ? "n" : "");
-
-	return buf;
-}
-
-
-static const char * print_type(const struct iwinfo_ops *iw, const char *ifname)
-{
-	const char *type = iwinfo_type(ifname);
-	return type ? type : "unknown";
-}
-
-static char * print_ssid(const struct iwinfo_ops *iw, const char *ifname)
-{
-	char buf[IWINFO_ESSID_MAX_SIZE+1] = { 0 };
-
-	if (iw->ssid(ifname, buf))
-		memset(buf, 0, sizeof(buf));
-
-	return format_ssid(buf);
-}
-
-static char * print_bssid(const struct iwinfo_ops *iw, const char *ifname)
-{
-	static char buf[18] = { 0 };
-
-	if (iw->bssid(ifname, buf))
-		snprintf(buf, sizeof(buf), "00:00:00:00:00:00");
-
-	return buf;
-}
-
-static char * print_mode(const struct iwinfo_ops *iw, const char *ifname)
-{
-	static char buf[128];
-
-	if (iw->mode(ifname, buf))
-		snprintf(buf, sizeof(buf), "unknown");
-
-	return buf;
-}
-
-static char * print_channel(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int ch;
-	if (iw->channel(ifname, &ch))
-		ch = -1;
-
-	return format_channel(ch);
-}
-
-static char * print_frequency(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int freq;
-	if (iw->frequency(ifname, &freq))
-		freq = -1;
-
-	return format_frequency(freq);
-}
-
-static char * print_txpower(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int pwr;
-	if (iw->txpower(ifname, &pwr))
-		pwr = -1;
-
-	return format_txpower(pwr);
-}
-
-static char * print_quality(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int qual;
-	if (iw->quality(ifname, &qual))
-		qual = -1;
-
-	return format_quality(qual);
-}
-
-static char * print_quality_max(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int qmax;
-	if (iw->quality_max(ifname, &qmax))
-		qmax = -1;
-
-	return format_quality_max(qmax);
-}
-
-static char * print_signal(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int sig;
-	if (iw->signal(ifname, &sig))
-		sig = 0;
-
-	return format_signal(sig);
-}
-
-static char * print_noise(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int noise;
-	if (iw->noise(ifname, &noise))
-		noise = 0;
-
-	return format_noise(noise);
-}
-
-static char * print_rate(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int rate;
-	if (iw->bitrate(ifname, &rate))
-		rate = -1;
-
-	return format_rate(rate);
-}
-
-static char * print_encryption(const struct iwinfo_ops *iw, const char *ifname)
-{
-	struct iwinfo_crypto_entry c = { 0 };
-	if (iw->encryption(ifname, (char *)&c))
-		return format_encryption(NULL);
-
-	return format_encryption(&c);
-}
-
-static char * print_hwmodes(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int modes;
-	if (iw->hwmodelist(ifname, &modes))
-		modes = -1;
-
-	return format_hwmodes(modes);
-}
-
-static char * print_mbssid_supp(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int supp;
-	static char buf[4];
-
-	if (iw->mbssid_support(ifname, &supp))
-		snprintf(buf, sizeof(buf), "no");
-	else
-		snprintf(buf, sizeof(buf), "%s", supp ? "yes" : "no");
-
-	return buf;
-}
-
-
-static void print_info(const struct iwinfo_ops *iw, const char *ifname)
-{
-	printf("%-9s ESSID: %s\n",
-		ifname,
-		print_ssid(iw, ifname));
-	printf("          Access Point: %s\n",
-		print_bssid(iw, ifname));
-	printf("          Type: %s  HW Mode(s): %s\n",
-		print_type(iw, ifname),
-		print_hwmodes(iw, ifname));
-	printf("          Mode: %s  Channel: %s (%s)\n",
-		print_mode(iw, ifname),
-		print_channel(iw, ifname),
-		print_frequency(iw, ifname));
-	printf("          Tx-Power: %s  Link Quality: %s/%s\n",
-		print_txpower(iw, ifname),
-		print_quality(iw, ifname),
-		print_quality_max(iw, ifname));
-	printf("          Signal: %s  Noise: %s\n",
-		print_signal(iw, ifname),
-		print_noise(iw, ifname));
-	printf("          Bit Rate: %s\n",
-		print_rate(iw, ifname));
-	printf("          Encryption: %s\n",
-		print_encryption(iw, ifname));
-	printf("          Supports VAPs: %s\n",
-		print_mbssid_supp(iw, ifname));
-}
-
-
-static void print_scanlist(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int i, x, len;
-	char buf[IWINFO_BUFSIZE];
-	struct iwinfo_scanlist_entry *e;
-
-	if (iw->scanlist(ifname, buf, &len))
-	{
-		printf("Scanning not possible\n\n");
-		return;
-	}
-	else if (len <= 0)
-	{
-		printf("No scan results\n\n");
-		return;
-	}
-
-	for (i = 0, x = 1; i < len; i += sizeof(struct iwinfo_scanlist_entry), x++)
-	{
-		e = (struct iwinfo_scanlist_entry *) &buf[i];
-
-		printf("Cell %02d - Address: %s\n",
-			x,
-			format_bssid(e->mac));
-		printf("          ESSID: %s\n",
-			format_ssid(e->ssid));
-		printf("          Mode: %s  Channel: %s\n",
-			e->mode ? (char *)e->mode : "unknown",
-			format_channel(e->channel));
-		printf("          Signal: %s  Quality: %s/%s\n",
-			format_signal(e->signal - 0x100),
-			format_quality(e->quality),
-			format_quality_max(e->quality_max));
-		printf("          Encryption: %s\n\n",
-			format_encryption(&e->crypto));
-	}
-}
-
-
-static void print_txpwrlist(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int len, pwr, i;
-	char buf[IWINFO_BUFSIZE];
-	struct iwinfo_txpwrlist_entry *e;
-
-	if (iw->txpwrlist(ifname, buf, &len) || len <= 0)
-	{
-		printf("No TX power information available\n");
-		return;
-	}
-
-	if (iw->txpower(ifname, &pwr))
-		pwr = -1;
-
-	for (i = 0; i < len; i += sizeof(struct iwinfo_txpwrlist_entry))
-	{
-		e = (struct iwinfo_txpwrlist_entry *) &buf[i];
-
-		printf("%s%3d dBm (%4d mW)\n",
-			(pwr == e->dbm) ? "*" : " ",
-			e->dbm,
-			e->mw);
-	}
-}
-
-
-static void print_freqlist(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int i, len, ch;
-	char buf[IWINFO_BUFSIZE];
-	struct iwinfo_freqlist_entry *e;
-
-	if (iw->freqlist(ifname, buf, &len) || len <= 0)
-	{
-		printf("No frequency information available\n");
-		return;
-	}
-
-	if (iw->channel(ifname, &ch))
-		ch = -1;
-
-	for (i = 0; i < len; i += sizeof(struct iwinfo_freqlist_entry))
-	{
-		e = (struct iwinfo_freqlist_entry *) &buf[i];
-
-		printf("%s %s (Channel %s)%s\n",
-			(ch == e->channel) ? "*" : " ",
-			format_frequency(e->mhz),
-			format_channel(e->channel),
-			e->restricted ? " [restricted]" : "");
-	}
-}
-
-
-static void print_assoclist(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int i, len;
-	char buf[IWINFO_BUFSIZE];
-	struct iwinfo_assoclist_entry *e;
-
-	if (iw->assoclist(ifname, buf, &len))
-	{
-		printf("No information available\n");
-		return;
-	}
-	else if (len <= 0)
-	{
-		printf("No station connected\n");
-		return;
-	}
-
-	for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry))
-	{
-		e = (struct iwinfo_assoclist_entry *) &buf[i];
-
-		printf("%s  %s / %s (SNR %d)\n",
-			format_bssid(e->mac),
-			format_signal(e->signal),
-			format_noise(e->noise),
-			(e->signal - e->noise));
-	}
-}
-
-
-static char * lookup_country(char *buf, int len, int iso3166)
-{
-	int i;
-	struct iwinfo_country_entry *c;
-
-	for (i = 0; i < len; i += sizeof(struct iwinfo_country_entry))
-	{
-		c = (struct iwinfo_country_entry *) &buf[i];
-
-		if (c->iso3166 == iso3166)
-			return c->ccode;
-	}
-
-	return NULL;
-}
-
-static void print_countrylist(const struct iwinfo_ops *iw, const char *ifname)
-{
-	int len;
-	char buf[IWINFO_BUFSIZE];
-	char *ccode;
-	char curcode[3];
-	const struct iwinfo_iso3166_label *l;
-
-	if (iw->countrylist(ifname, buf, &len))
-	{
-		printf("No country code information available\n");
-		return;
-	}
-
-	if (iw->country(ifname, curcode))
-		memset(curcode, 0, sizeof(curcode));
-
-	for (l = IWINFO_ISO3166_NAMES; l->iso3166; l++)
-	{
-		if ((ccode = lookup_country(buf, len, l->iso3166)) != NULL)
-		{
-			printf("%s %4s	%c%c\n",
-				strncmp(ccode, curcode, 2) ? " " : "*",
-				ccode, (l->iso3166 / 256), (l->iso3166 % 256));
-		}
-	}
-}
-
-
-int main(int argc, char **argv)
-{
-	int i;
-	const struct iwinfo_ops *iw;
-
-	if (argc < 3)
-	{
-		fprintf(stderr,
-			"Usage:\n"
-			"	iwinfo <device> info\n"
-			"	iwinfo <device> scan\n"
-			"	iwinfo <device> txpowerlist\n"
-			"	iwinfo <device> freqlist\n"
-			"	iwinfo <device> assoclist\n"
-			"	iwinfo <device> countrylist\n"
-		);
-
-		return 1;
-	}
-
-	iw = iwinfo_backend(argv[1]);
-
-	if (!iw)
-	{
-		fprintf(stderr, "No such wireless device: %s\n", argv[1]);
-		return 1;
-	}
-
-	for (i = 2; i < argc; i++)
-	{
-		switch(argv[i][0])
-		{
-		case 'i':
-			print_info(iw, argv[1]);
-			break;
-
-		case 's':
-			print_scanlist(iw, argv[1]);
-			break;
-
-		case 't':
-			print_txpwrlist(iw, argv[1]);
-			break;
-
-		case 'f':
-			print_freqlist(iw, argv[1]);
-			break;
-
-		case 'a':
-			print_assoclist(iw, argv[1]);
-			break;
-
-		case 'c':
-			print_countrylist(iw, argv[1]);
-			break;
-
-		default:
-			fprintf(stderr, "Unknown command: %s\n", argv[i]);
-			return 1;
-		}
-	}
-
-	iwinfo_finish();
-
-	return 0;
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_lib.c b/contrib/package/iwinfo/src/iwinfo_lib.c
deleted file mode 100644
index a7160417d..000000000
--- a/contrib/package/iwinfo/src/iwinfo_lib.c
+++ /dev/null
@@ -1,376 +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.h"
-
-
-/*
- * name constants
- */
-const char *IWINFO_CIPHER_NAMES[] = {
-	"NONE",
-	"WEP40",
-	"TKIP",
-	"WRAP",
-	"CCMP",
-	"WEP104",
-	"AES-OCB",
-	"CKIP",
-};
-
-const char *IWINFO_KMGMT_NAMES[] = {
-	"NONE",
-	"802.1X",
-	"PSK",
-};
-
-const char *IWINFO_AUTH_NAMES[] = {
-	"OPEN",
-	"SHARED",
-};
-
-
-/*
- * ISO3166 country labels
- */
-
-const struct iwinfo_iso3166_label IWINFO_ISO3166_NAMES[] = {
-	{ 0x3030 /* 00 */, "World" },
-	{ 0x4144 /* AD */, "Andorra" },
-	{ 0x4145 /* AE */, "United Arab Emirates" },
-	{ 0x4146 /* AF */, "Afghanistan" },
-	{ 0x4147 /* AG */, "Antigua and Barbuda" },
-	{ 0x4149 /* AI */, "Anguilla" },
-	{ 0x414C /* AL */, "Albania" },
-	{ 0x414D /* AM */, "Armenia" },
-	{ 0x414E /* AN */, "Netherlands Antilles" },
-	{ 0x414F /* AO */, "Angola" },
-	{ 0x4151 /* AQ */, "Antarctica" },
-	{ 0x4152 /* AR */, "Argentina" },
-	{ 0x4153 /* AS */, "American Samoa" },
-	{ 0x4154 /* AT */, "Austria" },
-	{ 0x4155 /* AU */, "Australia" },
-	{ 0x4157 /* AW */, "Aruba" },
-	{ 0x4158 /* AX */, "Aland Islands" },
-	{ 0x415A /* AZ */, "Azerbaijan" },
-	{ 0x4241 /* BA */, "Bosnia and Herzegovina" },
-	{ 0x4242 /* BB */, "Barbados" },
-	{ 0x4244 /* BD */, "Bangladesh" },
-	{ 0x4245 /* BE */, "Belgium" },
-	{ 0x4246 /* BF */, "Burkina Faso" },
-	{ 0x4247 /* BG */, "Bulgaria" },
-	{ 0x4248 /* BH */, "Bahrain" },
-	{ 0x4249 /* BI */, "Burundi" },
-	{ 0x424A /* BJ */, "Benin" },
-	{ 0x424C /* BL */, "Saint Barthelemy" },
-	{ 0x424D /* BM */, "Bermuda" },
-	{ 0x424E /* BN */, "Brunei Darussalam" },
-	{ 0x424F /* BO */, "Bolivia" },
-	{ 0x4252 /* BR */, "Brazil" },
-	{ 0x4253 /* BS */, "Bahamas" },
-	{ 0x4254 /* BT */, "Bhutan" },
-	{ 0x4256 /* BV */, "Bouvet Island" },
-	{ 0x4257 /* BW */, "Botswana" },
-	{ 0x4259 /* BY */, "Belarus" },
-	{ 0x425A /* BZ */, "Belize" },
-	{ 0x4341 /* CA */, "Canada" },
-	{ 0x4343 /* CC */, "Cocos (Keeling) Islands" },
-	{ 0x4344 /* CD */, "Congo" },
-	{ 0x4346 /* CF */, "Central African Republic" },
-	{ 0x4347 /* CG */, "Congo" },
-	{ 0x4348 /* CH */, "Switzerland" },
-	{ 0x4349 /* CI */, "Cote d'Ivoire" },
-	{ 0x434B /* CK */, "Cook Islands" },
-	{ 0x434C /* CL */, "Chile" },
-	{ 0x434D /* CM */, "Cameroon" },
-	{ 0x434E /* CN */, "China" },
-	{ 0x434F /* CO */, "Colombia" },
-	{ 0x4352 /* CR */, "Costa Rica" },
-	{ 0x4355 /* CU */, "Cuba" },
-	{ 0x4356 /* CV */, "Cape Verde" },
-	{ 0x4358 /* CX */, "Christmas Island" },
-	{ 0x4359 /* CY */, "Cyprus" },
-	{ 0x435A /* CZ */, "Czech Republic" },
-	{ 0x4445 /* DE */, "Germany" },
-	{ 0x444A /* DJ */, "Djibouti" },
-	{ 0x444B /* DK */, "Denmark" },
-	{ 0x444D /* DM */, "Dominica" },
-	{ 0x444F /* DO */, "Dominican Republic" },
-	{ 0x445A /* DZ */, "Algeria" },
-	{ 0x4543 /* EC */, "Ecuador" },
-	{ 0x4545 /* EE */, "Estonia" },
-	{ 0x4547 /* EG */, "Egypt" },
-	{ 0x4548 /* EH */, "Western Sahara" },
-	{ 0x4552 /* ER */, "Eritrea" },
-	{ 0x4553 /* ES */, "Spain" },
-	{ 0x4554 /* ET */, "Ethiopia" },
-	{ 0x4649 /* FI */, "Finland" },
-	{ 0x464A /* FJ */, "Fiji" },
-	{ 0x464B /* FK */, "Falkland Islands" },
-	{ 0x464D /* FM */, "Micronesia" },
-	{ 0x464F /* FO */, "Faroe Islands" },
-	{ 0x4652 /* FR */, "France" },
-	{ 0x4741 /* GA */, "Gabon" },
-	{ 0x4742 /* GB */, "United Kingdom" },
-	{ 0x4744 /* GD */, "Grenada" },
-	{ 0x4745 /* GE */, "Georgia" },
-	{ 0x4746 /* GF */, "French Guiana" },
-	{ 0x4747 /* GG */, "Guernsey" },
-	{ 0x4748 /* GH */, "Ghana" },
-	{ 0x4749 /* GI */, "Gibraltar" },
-	{ 0x474C /* GL */, "Greenland" },
-	{ 0x474D /* GM */, "Gambia" },
-	{ 0x474E /* GN */, "Guinea" },
-	{ 0x4750 /* GP */, "Guadeloupe" },
-	{ 0x4751 /* GQ */, "Equatorial Guinea" },
-	{ 0x4752 /* GR */, "Greece" },
-	{ 0x4753 /* GS */, "South Georgia" },
-	{ 0x4754 /* GT */, "Guatemala" },
-	{ 0x4755 /* GU */, "Guam" },
-	{ 0x4757 /* GW */, "Guinea-Bissau" },
-	{ 0x4759 /* GY */, "Guyana" },
-	{ 0x484B /* HK */, "Hong Kong" },
-	{ 0x484D /* HM */, "Heard and McDonald Islands" },
-	{ 0x484E /* HN */, "Honduras" },
-	{ 0x4852 /* HR */, "Croatia" },
-	{ 0x4854 /* HT */, "Haiti" },
-	{ 0x4855 /* HU */, "Hungary" },
-	{ 0x4944 /* ID */, "Indonesia" },
-	{ 0x4945 /* IE */, "Ireland" },
-	{ 0x494C /* IL */, "Israel" },
-	{ 0x494D /* IM */, "Isle of Man" },
-	{ 0x494E /* IN */, "India" },
-	{ 0x494F /* IO */, "Chagos Islands" },
-	{ 0x4951 /* IQ */, "Iraq" },
-	{ 0x4952 /* IR */, "Iran" },
-	{ 0x4953 /* IS */, "Iceland" },
-	{ 0x4954 /* IT */, "Italy" },
-	{ 0x4A45 /* JE */, "Jersey" },
-	{ 0x4A4D /* JM */, "Jamaica" },
-	{ 0x4A4F /* JO */, "Jordan" },
-	{ 0x4A50 /* JP */, "Japan" },
-	{ 0x4B45 /* KE */, "Kenya" },
-	{ 0x4B47 /* KG */, "Kyrgyzstan" },
-	{ 0x4B48 /* KH */, "Cambodia" },
-	{ 0x4B49 /* KI */, "Kiribati" },
-	{ 0x4B4D /* KM */, "Comoros" },
-	{ 0x4B4E /* KN */, "Saint Kitts and Nevis" },
-	{ 0x4B50 /* KP */, "North Korea" },
-	{ 0x4B52 /* KR */, "South Korea" },
-	{ 0x4B57 /* KW */, "Kuwait" },
-	{ 0x4B59 /* KY */, "Cayman Islands" },
-	{ 0x4B5A /* KZ */, "Kazakhstan" },
-	{ 0x4C41 /* LA */, "Laos" },
-	{ 0x4C42 /* LB */, "Lebanon" },
-	{ 0x4C43 /* LC */, "Saint Lucia" },
-	{ 0x4C49 /* LI */, "Liechtenstein" },
-	{ 0x4C4B /* LK */, "Sri Lanka" },
-	{ 0x4C52 /* LR */, "Liberia" },
-	{ 0x4C53 /* LS */, "Lesotho" },
-	{ 0x4C54 /* LT */, "Lithuania" },
-	{ 0x4C55 /* LU */, "Luxembourg" },
-	{ 0x4C56 /* LV */, "Latvia" },
-	{ 0x4C59 /* LY */, "Libyan Arab Jamahiriya" },
-	{ 0x4D41 /* MA */, "Morocco" },
-	{ 0x4D43 /* MC */, "Monaco" },
-	{ 0x4D44 /* MD */, "Moldova" },
-	{ 0x4D45 /* ME */, "Montenegro" },
-	{ 0x4D46 /* MF */, "Saint Martin (French part)" },
-	{ 0x4D47 /* MG */, "Madagascar" },
-	{ 0x4D48 /* MH */, "Marshall Islands" },
-	{ 0x4D4B /* MK */, "Macedonia" },
-	{ 0x4D4C /* ML */, "Mali" },
-	{ 0x4D4D /* MM */, "Myanmar" },
-	{ 0x4D4E /* MN */, "Mongolia" },
-	{ 0x4D4F /* MO */, "Macao" },
-	{ 0x4D50 /* MP */, "Northern Mariana Islands" },
-	{ 0x4D51 /* MQ */, "Martinique" },
-	{ 0x4D52 /* MR */, "Mauritania" },
-	{ 0x4D53 /* MS */, "Montserrat" },
-	{ 0x4D54 /* MT */, "Malta" },
-	{ 0x4D55 /* MU */, "Mauritius" },
-	{ 0x4D56 /* MV */, "Maldives" },
-	{ 0x4D57 /* MW */, "Malawi" },
-	{ 0x4D58 /* MX */, "Mexico" },
-	{ 0x4D59 /* MY */, "Malaysia" },
-	{ 0x4D5A /* MZ */, "Mozambique" },
-	{ 0x4E41 /* NA */, "Namibia" },
-	{ 0x4E43 /* NC */, "New Caledonia" },
-	{ 0x4E45 /* NE */, "Niger" },
-	{ 0x4E46 /* NF */, "Norfolk Island" },
-	{ 0x4E47 /* NG */, "Nigeria" },
-	{ 0x4E49 /* NI */, "Nicaragua" },
-	{ 0x4E4C /* NL */, "Netherlands" },
-	{ 0x4E4F /* NO */, "Norway" },
-	{ 0x4E50 /* NP */, "Nepal" },
-	{ 0x4E52 /* NR */, "Nauru" },
-	{ 0x4E55 /* NU */, "Niue" },
-	{ 0x4E5A /* NZ */, "New Zealand" },
-	{ 0x4F4D /* OM */, "Oman" },
-	{ 0x5041 /* PA */, "Panama" },
-	{ 0x5045 /* PE */, "Peru" },
-	{ 0x5046 /* PF */, "French Polynesia" },
-	{ 0x5047 /* PG */, "Papua New Guinea" },
-	{ 0x5048 /* PH */, "Philippines" },
-	{ 0x504B /* PK */, "Pakistan" },
-	{ 0x504C /* PL */, "Poland" },
-	{ 0x504D /* PM */, "Saint Pierre and Miquelon" },
-	{ 0x504E /* PN */, "Pitcairn" },
-	{ 0x5052 /* PR */, "Puerto Rico" },
-	{ 0x5053 /* PS */, "Palestinian Territory" },
-	{ 0x5054 /* PT */, "Portugal" },
-	{ 0x5057 /* PW */, "Palau" },
-	{ 0x5059 /* PY */, "Paraguay" },
-	{ 0x5141 /* QA */, "Qatar" },
-	{ 0x5245 /* RE */, "Reunion" },
-	{ 0x524F /* RO */, "Romania" },
-	{ 0x5253 /* RS */, "Serbia" },
-	{ 0x5255 /* RU */, "Russian Federation" },
-	{ 0x5257 /* RW */, "Rwanda" },
-	{ 0x5341 /* SA */, "Saudi Arabia" },
-	{ 0x5342 /* SB */, "Solomon Islands" },
-	{ 0x5343 /* SC */, "Seychelles" },
-	{ 0x5344 /* SD */, "Sudan" },
-	{ 0x5345 /* SE */, "Sweden" },
-	{ 0x5347 /* SG */, "Singapore" },
-	{ 0x5348 /* SH */, "St. Helena and Dependencies" },
-	{ 0x5349 /* SI */, "Slovenia" },
-	{ 0x534A /* SJ */, "Svalbard and Jan Mayen" },
-	{ 0x534B /* SK */, "Slovakia" },
-	{ 0x534C /* SL */, "Sierra Leone" },
-	{ 0x534D /* SM */, "San Marino" },
-	{ 0x534E /* SN */, "Senegal" },
-	{ 0x534F /* SO */, "Somalia" },
-	{ 0x5352 /* SR */, "Suriname" },
-	{ 0x5354 /* ST */, "Sao Tome and Principe" },
-	{ 0x5356 /* SV */, "El Salvador" },
-	{ 0x5359 /* SY */, "Syrian Arab Republic" },
-	{ 0x535A /* SZ */, "Swaziland" },
-	{ 0x5443 /* TC */, "Turks and Caicos Islands" },
-	{ 0x5444 /* TD */, "Chad" },
-	{ 0x5446 /* TF */, "French Southern Territories" },
-	{ 0x5447 /* TG */, "Togo" },
-	{ 0x5448 /* TH */, "Thailand" },
-	{ 0x544A /* TJ */, "Tajikistan" },
-	{ 0x544B /* TK */, "Tokelau" },
-	{ 0x544C /* TL */, "Timor-Leste" },
-	{ 0x544D /* TM */, "Turkmenistan" },
-	{ 0x544E /* TN */, "Tunisia" },
-	{ 0x544F /* TO */, "Tonga" },
-	{ 0x5452 /* TR */, "Turkey" },
-	{ 0x5454 /* TT */, "Trinidad and Tobago" },
-	{ 0x5456 /* TV */, "Tuvalu" },
-	{ 0x5457 /* TW */, "Taiwan" },
-	{ 0x545A /* TZ */, "Tanzania" },
-	{ 0x5541 /* UA */, "Ukraine" },
-	{ 0x5547 /* UG */, "Uganda" },
-	{ 0x554D /* UM */, "U.S. Minor Outlying Islands" },
-	{ 0x5553 /* US */, "United States" },
-	{ 0x5559 /* UY */, "Uruguay" },
-	{ 0x555A /* UZ */, "Uzbekistan" },
-	{ 0x5641 /* VA */, "Vatican City State" },
-	{ 0x5643 /* VC */, "St. Vincent and Grenadines" },
-	{ 0x5645 /* VE */, "Venezuela" },
-	{ 0x5647 /* VG */, "Virgin Islands, British" },
-	{ 0x5649 /* VI */, "Virgin Islands, U.S." },
-	{ 0x564E /* VN */, "Viet Nam" },
-	{ 0x5655 /* VU */, "Vanuatu" },
-	{ 0x5746 /* WF */, "Wallis and Futuna" },
-	{ 0x5753 /* WS */, "Samoa" },
-	{ 0x5945 /* YE */, "Yemen" },
-	{ 0x5954 /* YT */, "Mayotte" },
-	{ 0x5A41 /* ZA */, "South Africa" },
-	{ 0x5A4D /* ZM */, "Zambia" },
-	{ 0x5A57 /* ZW */, "Zimbabwe" },
-	{ 0,               "" }
-};
-
-
-const char * iwinfo_type(const char *ifname)
-{
-#ifdef USE_NL80211
-	if (nl80211_probe(ifname))
-		return "nl80211";
-	else
-#endif
-
-#ifdef USE_MADWIFI
-	if (madwifi_probe(ifname))
-		return "madwifi";
-	else
-#endif
-
-#ifdef USE_WL
-	if (wl_probe(ifname))
-		return "wl";
-	else
-#endif
-
-	if (wext_probe(ifname))
-		return "wext";
-
-	return NULL;
-}
-
-const struct iwinfo_ops * iwinfo_backend(const char *ifname)
-{
-	const char *type;
-	struct iwinfo_ops *ops;
-
-	type = iwinfo_type(ifname);
-	if (!type)
-		return NULL;
-
-#ifdef USE_NL80211
-	if (!strcmp(type, "nl80211"))
-		return &nl80211_ops;
-	else
-#endif
-
-#ifdef USE_MADWIFI
-	if (!strcmp(type, "madwifi"))
-		return &madwifi_ops;
-	else
-#endif
-
-#ifdef USE_WL
-	if (!strcmp(type, "wl"))
-		return &wl_ops;
-	else
-#endif
-
-	if (!strcmp(type, "wext"))
-		return &wext_ops;
-
-	return NULL;
-}
-
-void iwinfo_finish(void)
-{
-#ifdef USE_WL
-	wl_close();
-#endif
-#ifdef USE_MADWIFI
-	madwifi_close();
-#endif
-#ifdef USE_NL80211
-	nl80211_close();
-#endif
-	wext_close();
-	iwinfo_close();
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_lua.c b/contrib/package/iwinfo/src/iwinfo_lua.c
deleted file mode 100644
index 997cc8a56..000000000
--- a/contrib/package/iwinfo/src/iwinfo_lua.c
+++ /dev/null
@@ -1,769 +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/lua.h"
-
-
-/* Determine type */
-static int iwinfo_L_type(lua_State *L)
-{
-	const char *ifname = luaL_checkstring(L, 1);
-	const char *type = iwinfo_type(ifname);
-
-	if (type)
-		lua_pushstring(L, type);
-	else
-		lua_pushnil(L);
-
-	return 1;
-}
-
-/* Shutdown backends */
-static int iwinfo_L__gc(lua_State *L)
-{
-	iwinfo_finish();
-	return 0;
-}
-
-/*
- * Build a short textual description of the crypto info
- */
-
-static char * iwinfo_crypto_print_ciphers(int ciphers)
-{
-	static char str[128] = { 0 };
-	char *pos = str;
-
-	if (ciphers & IWINFO_CIPHER_WEP40)
-		pos += sprintf(pos, "WEP-40, ");
-
-	if (ciphers & IWINFO_CIPHER_WEP104)
-		pos += sprintf(pos, "WEP-104, ");
-
-	if (ciphers & IWINFO_CIPHER_TKIP)
-		pos += sprintf(pos, "TKIP, ");
-
-	if (ciphers & IWINFO_CIPHER_CCMP)
-		pos += sprintf(pos, "CCMP, ");
-
-	if (ciphers & IWINFO_CIPHER_WRAP)
-		pos += sprintf(pos, "WRAP, ");
-
-	if (ciphers & IWINFO_CIPHER_AESOCB)
-		pos += sprintf(pos, "AES-OCB, ");
-
-	if (ciphers & IWINFO_CIPHER_CKIP)
-		pos += sprintf(pos, "CKIP, ");
-
-	if (!ciphers || (ciphers & IWINFO_CIPHER_NONE))
-		pos += sprintf(pos, "NONE, ");
-
-	*(pos - 2) = 0;
-
-	return str;
-}
-
-static char * iwinfo_crypto_print_suites(int suites)
-{
-	static char str[64] = { 0 };
-	char *pos = str;
-
-	if (suites & IWINFO_KMGMT_PSK)
-		pos += sprintf(pos, "PSK/");
-
-	if (suites & IWINFO_KMGMT_8021x)
-		pos += sprintf(pos, "802.1X/");
-
-	if (!suites || (suites & IWINFO_KMGMT_NONE))
-		pos += sprintf(pos, "NONE/");
-
-	*(pos - 1) = 0;
-
-	return str;
-}
-
-static char * iwinfo_crypto_desc(struct iwinfo_crypto_entry *c)
-{
-	static char desc[512] = { 0 };
-
-	if (c)
-	{
-		if (c->enabled)
-		{
-			/* WEP */
-			if (c->auth_algs && !c->wpa_version)
-			{
-				if ((c->auth_algs & IWINFO_AUTH_OPEN) &&
-				    (c->auth_algs & IWINFO_AUTH_SHARED))
-				{
-					sprintf(desc, "WEP Open/Shared (%s)",
-						iwinfo_crypto_print_ciphers(c->pair_ciphers));
-				}
-				else if (c->auth_algs & IWINFO_AUTH_OPEN)
-				{
-					sprintf(desc, "WEP Open System (%s)",
-						iwinfo_crypto_print_ciphers(c->pair_ciphers));
-				}
-				else if (c->auth_algs & IWINFO_AUTH_SHARED)
-				{
-					sprintf(desc, "WEP Shared Auth (%s)",
-						iwinfo_crypto_print_ciphers(c->pair_ciphers));
-				}
-			}
-
-			/* WPA */
-			else if (c->wpa_version)
-			{
-				switch (c->wpa_version) {
-					case 3:
-						sprintf(desc, "mixed WPA/WPA2 %s (%s)",
-							iwinfo_crypto_print_suites(c->auth_suites),
-							iwinfo_crypto_print_ciphers(
-								c->pair_ciphers & c->group_ciphers));
-						break;
-
-					case 2:
-						sprintf(desc, "WPA2 %s (%s)",
-							iwinfo_crypto_print_suites(c->auth_suites),
-							iwinfo_crypto_print_ciphers(
-								c->pair_ciphers & c->group_ciphers));
-						break;
-
-					case 1:
-						sprintf(desc, "WPA %s (%s)",
-							iwinfo_crypto_print_suites(c->auth_suites),
-							iwinfo_crypto_print_ciphers(
-								c->pair_ciphers & c->group_ciphers));
-						break;
-				}
-			}
-			else
-			{
-				sprintf(desc, "None");
-			}
-		}
-		else
-		{
-			sprintf(desc, "None");
-		}
-	}
-	else
-	{
-		sprintf(desc, "Unknown");
-	}
-
-	return desc;
-}
-
-/* Build Lua table from crypto data */
-static void iwinfo_L_cryptotable(lua_State *L, struct iwinfo_crypto_entry *c)
-{
-	int i, j;
-
-	lua_newtable(L);
-
-	lua_pushboolean(L, c->enabled);
-	lua_setfield(L, -2, "enabled");
-
-	lua_pushstring(L, iwinfo_crypto_desc(c));
-	lua_setfield(L, -2, "description");
-
-	lua_pushboolean(L, (c->enabled && !c->wpa_version));
-	lua_setfield(L, -2, "wep");
-
-	lua_pushinteger(L, c->wpa_version);
-	lua_setfield(L, -2, "wpa");
-
-	lua_newtable(L);
-	for (i = 0, j = 1; i < 8; i++)
-	{
-		if (c->pair_ciphers & (1 << i))
-		{
-			lua_pushstring(L, IWINFO_CIPHER_NAMES[i]);
-			lua_rawseti(L, -2, j++);
-		}
-	}
-	lua_setfield(L, -2, "pair_ciphers");
-
-	lua_newtable(L);
-	for (i = 0, j = 1; i < 8; i++)
-	{
-		if (c->group_ciphers & (1 << i))
-		{
-			lua_pushstring(L, IWINFO_CIPHER_NAMES[i]);
-			lua_rawseti(L, -2, j++);
-		}
-	}
-	lua_setfield(L, -2, "group_ciphers");
-
-	lua_newtable(L);
-	for (i = 0, j = 1; i < 8; i++)
-	{
-		if (c->auth_suites & (1 << i))
-		{
-			lua_pushstring(L, IWINFO_KMGMT_NAMES[i]);
-			lua_rawseti(L, -2, j++);
-		}
-	}
-	lua_setfield(L, -2, "auth_suites");
-
-	lua_newtable(L);
-	for (i = 0, j = 1; i < 8; i++)
-	{
-		if (c->auth_algs & (1 << i))
-		{
-			lua_pushstring(L, IWINFO_AUTH_NAMES[i]);
-			lua_rawseti(L, -2, j++);
-		}
-	}
-	lua_setfield(L, -2, "auth_algs");
-}
-
-
-/* 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, x, 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 */
-			iwinfo_L_cryptotable(L, &e->crypto);
-			lua_setfield(L, -2, "encryption");
-
-			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");
-
-			/* Restricted (DFS/TPC/Radar) */
-			lua_pushboolean(L, e->restricted);
-			lua_setfield(L, -2, "restricted");
-
-			lua_rawseti(L, -2, x);
-		}
-	}
-
-	return 1;
-}
-
-/* Wrapper for crypto settings */
-static int iwinfo_L_encryption(lua_State *L, int (*func)(const char *, char *))
-{
-	const char *ifname = luaL_checkstring(L, 1);
-	struct iwinfo_crypto_entry c = { 0 };
-
-	if (!(*func)(ifname, (char *)&c))
-	{
-		iwinfo_L_cryptotable(L, &c);
-		return 1;
-	}
-
-	lua_pushnil(L);
-	return 1;
-}
-
-/* Wrapper for hwmode list */
-static int iwinfo_L_hwmodelist(lua_State *L, int (*func)(const char *, int *))
-{
-	const char *ifname = luaL_checkstring(L, 1);
-	int hwmodes = 0;
-
-	if (!(*func)(ifname, &hwmodes))
-	{
-		lua_newtable(L);
-
-		lua_pushboolean(L, hwmodes & IWINFO_80211_A);
-		lua_setfield(L, -2, "a");
-
-		lua_pushboolean(L, hwmodes & IWINFO_80211_B);
-		lua_setfield(L, -2, "b");
-
-		lua_pushboolean(L, hwmodes & IWINFO_80211_G);
-		lua_setfield(L, -2, "g");
-
-		lua_pushboolean(L, hwmodes & IWINFO_80211_N);
-		lua_setfield(L, -2, "n");
-
-		return 1;
-	}
-
-	lua_pushnil(L);
-	return 1;
-}
-
-/* Wrapper for mbbsid_support */
-static int iwinfo_L_mbssid_support(lua_State *L, int (*func)(const char *, int *))
-{
-	const char *ifname = luaL_checkstring(L, 1);
-	int support = 0;
-
-	if (!(*func)(ifname, &support))
-	{
-		lua_pushboolean(L, support);
-		return 1;
-	}
-
-	lua_pushnil(L);
-	return 1;
-}
-
-/* Wrapper for country list */
-static char * iwinfo_L_country_lookup(char *buf, int len, int iso3166)
-{
-	int i;
-	struct iwinfo_country_entry *c;
-
-	for (i = 0; i < len; i += sizeof(struct iwinfo_country_entry))
-	{
-		c = (struct iwinfo_country_entry *) &buf[i];
-
-		if (c->iso3166 == iso3166)
-			return c->ccode;
-	}
-
-	return NULL;
-}
-
-static int iwinfo_L_countrylist(lua_State *L, int (*func)(const char *, char *, int *))
-{
-	int len, i, j;
-	char rv[IWINFO_BUFSIZE], alpha2[3];
-	char *ccode;
-	const char *ifname = luaL_checkstring(L, 1);
-	const struct iwinfo_iso3166_label *l;
-
-	lua_newtable(L);
-	memset(rv, 0, sizeof(rv));
-
-	if (!(*func)(ifname, rv, &len))
-	{
-		for (l = IWINFO_ISO3166_NAMES, j = 1; l->iso3166; l++)
-		{
-			if ((ccode = iwinfo_L_country_lookup(rv, len, l->iso3166)) != NULL)
-			{
-				sprintf(alpha2, "%c%c",
-					(l->iso3166 / 256), (l->iso3166 % 256));
-
-				lua_newtable(L);
-
-				lua_pushstring(L, alpha2);
-				lua_setfield(L, -2, "alpha2");
-
-				lua_pushstring(L, ccode);
-				lua_setfield(L, -2, "ccode");
-
-				lua_pushstring(L, l->name);
-				lua_setfield(L, -2, "name");
-
-				lua_rawseti(L, -2, j++);
-			}
-		}
-	}
-
-	return 1;
-}
-
-
-#ifdef USE_WL
-/* Broadcom */
-LUA_WRAP_INT(wl,channel)
-LUA_WRAP_INT(wl,frequency)
-LUA_WRAP_INT(wl,txpower)
-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_STRING(wl,mode)
-LUA_WRAP_STRING(wl,ssid)
-LUA_WRAP_STRING(wl,bssid)
-LUA_WRAP_STRING(wl,country)
-LUA_WRAP_LIST(wl,assoclist)
-LUA_WRAP_LIST(wl,txpwrlist)
-LUA_WRAP_LIST(wl,scanlist)
-LUA_WRAP_LIST(wl,freqlist)
-LUA_WRAP_LIST(wl,countrylist)
-LUA_WRAP_LIST(wl,hwmodelist)
-LUA_WRAP_LIST(wl,encryption)
-LUA_WRAP_LIST(wl,mbssid_support)
-#endif
-
-#ifdef USE_MADWIFI
-/* Madwifi */
-LUA_WRAP_INT(madwifi,channel)
-LUA_WRAP_INT(madwifi,frequency)
-LUA_WRAP_INT(madwifi,txpower)
-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_STRING(madwifi,mode)
-LUA_WRAP_STRING(madwifi,ssid)
-LUA_WRAP_STRING(madwifi,bssid)
-LUA_WRAP_STRING(madwifi,country)
-LUA_WRAP_LIST(madwifi,assoclist)
-LUA_WRAP_LIST(madwifi,txpwrlist)
-LUA_WRAP_LIST(madwifi,scanlist)
-LUA_WRAP_LIST(madwifi,freqlist)
-LUA_WRAP_LIST(madwifi,countrylist)
-LUA_WRAP_LIST(madwifi,hwmodelist)
-LUA_WRAP_LIST(madwifi,encryption)
-LUA_WRAP_LIST(madwifi,mbssid_support)
-#endif
-
-#ifdef USE_NL80211
-/* NL80211 */
-LUA_WRAP_INT(nl80211,channel)
-LUA_WRAP_INT(nl80211,frequency)
-LUA_WRAP_INT(nl80211,txpower)
-LUA_WRAP_INT(nl80211,bitrate)
-LUA_WRAP_INT(nl80211,signal)
-LUA_WRAP_INT(nl80211,noise)
-LUA_WRAP_INT(nl80211,quality)
-LUA_WRAP_INT(nl80211,quality_max)
-LUA_WRAP_STRING(nl80211,mode)
-LUA_WRAP_STRING(nl80211,ssid)
-LUA_WRAP_STRING(nl80211,bssid)
-LUA_WRAP_STRING(nl80211,country)
-LUA_WRAP_LIST(nl80211,assoclist)
-LUA_WRAP_LIST(nl80211,txpwrlist)
-LUA_WRAP_LIST(nl80211,scanlist)
-LUA_WRAP_LIST(nl80211,freqlist)
-LUA_WRAP_LIST(nl80211,countrylist)
-LUA_WRAP_LIST(nl80211,hwmodelist)
-LUA_WRAP_LIST(nl80211,encryption)
-LUA_WRAP_LIST(nl80211,mbssid_support)
-#endif
-
-/* Wext */
-LUA_WRAP_INT(wext,channel)
-LUA_WRAP_INT(wext,frequency)
-LUA_WRAP_INT(wext,txpower)
-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_STRING(wext,mode)
-LUA_WRAP_STRING(wext,ssid)
-LUA_WRAP_STRING(wext,bssid)
-LUA_WRAP_STRING(wext,country)
-LUA_WRAP_LIST(wext,assoclist)
-LUA_WRAP_LIST(wext,txpwrlist)
-LUA_WRAP_LIST(wext,scanlist)
-LUA_WRAP_LIST(wext,freqlist)
-LUA_WRAP_LIST(wext,countrylist)
-LUA_WRAP_LIST(wext,hwmodelist)
-LUA_WRAP_LIST(wext,encryption)
-LUA_WRAP_LIST(wext,mbssid_support)
-
-#ifdef USE_WL
-/* Broadcom table */
-static const luaL_reg R_wl[] = {
-	LUA_REG(wl,channel),
-	LUA_REG(wl,frequency),
-	LUA_REG(wl,txpower),
-	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,country),
-	LUA_REG(wl,assoclist),
-	LUA_REG(wl,txpwrlist),
-	LUA_REG(wl,scanlist),
-	LUA_REG(wl,freqlist),
-	LUA_REG(wl,countrylist),
-	LUA_REG(wl,hwmodelist),
-	LUA_REG(wl,encryption),
-	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,txpower),
-	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,country),
-	LUA_REG(madwifi,assoclist),
-	LUA_REG(madwifi,txpwrlist),
-	LUA_REG(madwifi,scanlist),
-	LUA_REG(madwifi,freqlist),
-	LUA_REG(madwifi,countrylist),
-	LUA_REG(madwifi,hwmodelist),
-	LUA_REG(madwifi,encryption),
-	LUA_REG(madwifi,mbssid_support),
-	{ NULL, NULL }
-};
-#endif
-
-#ifdef USE_NL80211
-/* NL80211 table */
-static const luaL_reg R_nl80211[] = {
-	LUA_REG(nl80211,channel),
-	LUA_REG(nl80211,frequency),
-	LUA_REG(nl80211,txpower),
-	LUA_REG(nl80211,bitrate),
-	LUA_REG(nl80211,signal),
-	LUA_REG(nl80211,noise),
-	LUA_REG(nl80211,quality),
-	LUA_REG(nl80211,quality_max),
-	LUA_REG(nl80211,mode),
-	LUA_REG(nl80211,ssid),
-	LUA_REG(nl80211,bssid),
-	LUA_REG(nl80211,country),
-	LUA_REG(nl80211,assoclist),
-	LUA_REG(nl80211,txpwrlist),
-	LUA_REG(nl80211,scanlist),
-	LUA_REG(nl80211,freqlist),
-	LUA_REG(nl80211,countrylist),
-	LUA_REG(nl80211,hwmodelist),
-	LUA_REG(nl80211,encryption),
-	LUA_REG(nl80211,mbssid_support),
-	{ NULL, NULL }
-};
-#endif
-
-/* Wext table */
-static const luaL_reg R_wext[] = {
-	LUA_REG(wext,channel),
-	LUA_REG(wext,frequency),
-	LUA_REG(wext,txpower),
-	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,country),
-	LUA_REG(wext,assoclist),
-	LUA_REG(wext,txpwrlist),
-	LUA_REG(wext,scanlist),
-	LUA_REG(wext,freqlist),
-	LUA_REG(wext,countrylist),
-	LUA_REG(wext,hwmodelist),
-	LUA_REG(wext,encryption),
-	LUA_REG(wext,mbssid_support),
-	{ NULL, NULL }
-};
-
-/* Common */
-static const luaL_reg R_common[] = {
-	{ "type", iwinfo_L_type },
-	{ "__gc", iwinfo_L__gc  },
-	{ 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
-
-#ifdef USE_NL80211
-	luaL_newmetatable(L, IWINFO_NL80211_META);
-	luaL_register(L, NULL, R_nl80211);
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -2, "__index");
-	lua_setfield(L, -2, "nl80211");
-#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/contrib/package/iwinfo/src/iwinfo_madwifi.c b/contrib/package/iwinfo/src/iwinfo_madwifi.c
deleted file mode 100644
index 54082c737..000000000
--- a/contrib/package/iwinfo/src/iwinfo_madwifi.c
+++ /dev/null
@@ -1,989 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Madwifi Backend
- *
- *   Copyright (C) 2009-2010 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"
-
-
-/*
- * Madwifi ISO 3166 to Country/Region Code mapping.
- */
-
-static struct ISO3166_to_CCode
-{
-	u_int16_t iso3166;
-	u_int16_t ccode;
-} CountryCodes[] = {
-	{ 0x3030 /* 00 */,   0 }, /* World */
-	{ 0x4145 /* AE */, 784 }, /* U.A.E. */
-	{ 0x414C /* AL */,   8 }, /* Albania */
-	{ 0x414D /* AM */,  51 }, /* Armenia */
-	{ 0x4152 /* AR */,  32 }, /* Argentina */
-	{ 0x4154 /* AT */,  40 }, /* Austria */
-	{ 0x4155 /* AU */,  36 }, /* Australia */
-	{ 0x415A /* AZ */,  31 }, /* Azerbaijan */
-	{ 0x4245 /* BE */,  56 }, /* Belgium */
-	{ 0x4247 /* BG */, 100 }, /* Bulgaria */
-	{ 0x4248 /* BH */,  48 }, /* Bahrain */
-	{ 0x424E /* BN */,  96 }, /* Brunei Darussalam */
-	{ 0x424F /* BO */,  68 }, /* Bolivia */
-	{ 0x4252 /* BR */,  76 }, /* Brazil */
-	{ 0x4259 /* BY */, 112 }, /* Belarus */
-	{ 0x425A /* BZ */,  84 }, /* Belize */
-	{ 0x4341 /* CA */, 124 }, /* Canada */
-	{ 0x4348 /* CH */, 756 }, /* Switzerland */
-	{ 0x434C /* CL */, 152 }, /* Chile */
-	{ 0x434E /* CN */, 156 }, /* People's Republic of China */
-	{ 0x434F /* CO */, 170 }, /* Colombia */
-	{ 0x4352 /* CR */, 188 }, /* Costa Rica */
-	{ 0x4359 /* CY */, 196 }, /* Cyprus */
-	{ 0x435A /* CZ */, 203 }, /* Czech Republic */
-	{ 0x4445 /* DE */, 276 }, /* Germany */
-	{ 0x444B /* DK */, 208 }, /* Denmark */
-	{ 0x444F /* DO */, 214 }, /* Dominican Republic */
-	{ 0x445A /* DZ */,  12 }, /* Algeria */
-	{ 0x4543 /* EC */, 218 }, /* Ecuador */
-	{ 0x4545 /* EE */, 233 }, /* Estonia */
-	{ 0x4547 /* EG */, 818 }, /* Egypt */
-	{ 0x4553 /* ES */, 724 }, /* Spain */
-	{ 0x4649 /* FI */, 246 }, /* Finland */
-	{ 0x464F /* FO */, 234 }, /* Faeroe Islands */
-	{ 0x4652 /* FR */, 250 }, /* France */
-	{ 0x4652 /* FR */, 255 }, /* France2 */
-	{ 0x4742 /* GB */, 826 }, /* United Kingdom */
-	{ 0x4745 /* GE */, 268 }, /* Georgia */
-	{ 0x4752 /* GR */, 300 }, /* Greece */
-	{ 0x4754 /* GT */, 320 }, /* Guatemala */
-	{ 0x484B /* HK */, 344 }, /* Hong Kong S.A.R., P.R.C. */
-	{ 0x484E /* HN */, 340 }, /* Honduras */
-	{ 0x4852 /* HR */, 191 }, /* Croatia */
-	{ 0x4855 /* HU */, 348 }, /* Hungary */
-	{ 0x4944 /* ID */, 360 }, /* Indonesia */
-	{ 0x4945 /* IE */, 372 }, /* Ireland */
-	{ 0x494C /* IL */, 376 }, /* Israel */
-	{ 0x494E /* IN */, 356 }, /* India */
-	{ 0x4951 /* IQ */, 368 }, /* Iraq */
-	{ 0x4952 /* IR */, 364 }, /* Iran */
-	{ 0x4953 /* IS */, 352 }, /* Iceland */
-	{ 0x4954 /* IT */, 380 }, /* Italy */
-	{ 0x4A4D /* JM */, 388 }, /* Jamaica */
-	{ 0x4A4F /* JO */, 400 }, /* Jordan */
-	{ 0x4A50 /* JP */, 392 }, /* Japan */
-	{ 0x4A50 /* JP */, 393 }, /* Japan (JP1) */
-	{ 0x4A50 /* JP */, 394 }, /* Japan (JP0) */
-	{ 0x4A50 /* JP */, 395 }, /* Japan (JP1-1) */
-	{ 0x4A50 /* JP */, 396 }, /* Japan (JE1) */
-	{ 0x4A50 /* JP */, 397 }, /* Japan (JE2) */
-	{ 0x4A50 /* JP */, 399 }, /* Japan (JP6) */
-	{ 0x4A50 /* JP */, 900 }, /* Japan */
-	{ 0x4A50 /* JP */, 901 }, /* Japan */
-	{ 0x4A50 /* JP */, 902 }, /* Japan */
-	{ 0x4A50 /* JP */, 903 }, /* Japan */
-	{ 0x4A50 /* JP */, 904 }, /* Japan */
-	{ 0x4A50 /* JP */, 905 }, /* Japan */
-	{ 0x4A50 /* JP */, 906 }, /* Japan */
-	{ 0x4A50 /* JP */, 907 }, /* Japan */
-	{ 0x4A50 /* JP */, 908 }, /* Japan */
-	{ 0x4A50 /* JP */, 909 }, /* Japan */
-	{ 0x4A50 /* JP */, 910 }, /* Japan */
-	{ 0x4A50 /* JP */, 911 }, /* Japan */
-	{ 0x4A50 /* JP */, 912 }, /* Japan */
-	{ 0x4A50 /* JP */, 913 }, /* Japan */
-	{ 0x4A50 /* JP */, 914 }, /* Japan */
-	{ 0x4A50 /* JP */, 915 }, /* Japan */
-	{ 0x4A50 /* JP */, 916 }, /* Japan */
-	{ 0x4A50 /* JP */, 917 }, /* Japan */
-	{ 0x4A50 /* JP */, 918 }, /* Japan */
-	{ 0x4A50 /* JP */, 919 }, /* Japan */
-	{ 0x4A50 /* JP */, 920 }, /* Japan */
-	{ 0x4A50 /* JP */, 921 }, /* Japan */
-	{ 0x4A50 /* JP */, 922 }, /* Japan */
-	{ 0x4A50 /* JP */, 923 }, /* Japan */
-	{ 0x4A50 /* JP */, 924 }, /* Japan */
-	{ 0x4A50 /* JP */, 925 }, /* Japan */
-	{ 0x4A50 /* JP */, 926 }, /* Japan */
-	{ 0x4A50 /* JP */, 927 }, /* Japan */
-	{ 0x4A50 /* JP */, 928 }, /* Japan */
-	{ 0x4A50 /* JP */, 929 }, /* Japan */
-	{ 0x4A50 /* JP */, 930 }, /* Japan */
-	{ 0x4A50 /* JP */, 931 }, /* Japan */
-	{ 0x4A50 /* JP */, 932 }, /* Japan */
-	{ 0x4A50 /* JP */, 933 }, /* Japan */
-	{ 0x4A50 /* JP */, 934 }, /* Japan */
-	{ 0x4A50 /* JP */, 935 }, /* Japan */
-	{ 0x4A50 /* JP */, 936 }, /* Japan */
-	{ 0x4A50 /* JP */, 937 }, /* Japan */
-	{ 0x4A50 /* JP */, 938 }, /* Japan */
-	{ 0x4A50 /* JP */, 939 }, /* Japan */
-	{ 0x4A50 /* JP */, 940 }, /* Japan */
-	{ 0x4A50 /* JP */, 941 }, /* Japan */
-	{ 0x4B45 /* KE */, 404 }, /* Kenya */
-	{ 0x4B50 /* KP */, 408 }, /* North Korea */
-	{ 0x4B52 /* KR */, 410 }, /* South Korea */
-	{ 0x4B52 /* KR */, 411 }, /* South Korea */
-	{ 0x4B57 /* KW */, 414 }, /* Kuwait */
-	{ 0x4B5A /* KZ */, 398 }, /* Kazakhstan */
-	{ 0x4C42 /* LB */, 422 }, /* Lebanon */
-	{ 0x4C49 /* LI */, 438 }, /* Liechtenstein */
-	{ 0x4C54 /* LT */, 440 }, /* Lithuania */
-	{ 0x4C55 /* LU */, 442 }, /* Luxembourg */
-	{ 0x4C56 /* LV */, 428 }, /* Latvia */
-	{ 0x4C59 /* LY */, 434 }, /* Libya */
-	{ 0x4D41 /* MA */, 504 }, /* Morocco */
-	{ 0x4D43 /* MC */, 492 }, /* Principality of Monaco */
-	{ 0x4D4B /* MK */, 807 }, /* the Former Yugoslav Republic of Macedonia */
-	{ 0x4D4F /* MO */, 446 }, /* Macau */
-	{ 0x4D58 /* MX */, 484 }, /* Mexico */
-	{ 0x4D59 /* MY */, 458 }, /* Malaysia */
-	{ 0x4E49 /* NI */, 558 }, /* Nicaragua */
-	{ 0x4E4C /* NL */, 528 }, /* Netherlands */
-	{ 0x4E4F /* NO */, 578 }, /* Norway */
-	{ 0x4E5A /* NZ */, 554 }, /* New Zealand */
-	{ 0x4F4D /* OM */, 512 }, /* Oman */
-	{ 0x5041 /* PA */, 591 }, /* Panama */
-	{ 0x5045 /* PE */, 604 }, /* Peru */
-	{ 0x5048 /* PH */, 608 }, /* Republic of the Philippines */
-	{ 0x504B /* PK */, 586 }, /* Islamic Republic of Pakistan */
-	{ 0x504C /* PL */, 616 }, /* Poland */
-	{ 0x5052 /* PR */, 630 }, /* Puerto Rico */
-	{ 0x5054 /* PT */, 620 }, /* Portugal */
-	{ 0x5059 /* PY */, 600 }, /* Paraguay */
-	{ 0x5141 /* QA */, 634 }, /* Qatar */
-	{ 0x524F /* RO */, 642 }, /* Romania */
-	{ 0x5255 /* RU */, 643 }, /* Russia */
-	{ 0x5341 /* SA */, 682 }, /* Saudi Arabia */
-	{ 0x5345 /* SE */, 752 }, /* Sweden */
-	{ 0x5347 /* SG */, 702 }, /* Singapore */
-	{ 0x5349 /* SI */, 705 }, /* Slovenia */
-	{ 0x534B /* SK */, 703 }, /* Slovak Republic */
-	{ 0x5356 /* SV */, 222 }, /* El Salvador */
-	{ 0x5359 /* SY */, 760 }, /* Syria */
-	{ 0x5448 /* TH */, 764 }, /* Thailand */
-	{ 0x544E /* TN */, 788 }, /* Tunisia */
-	{ 0x5452 /* TR */, 792 }, /* Turkey */
-	{ 0x5454 /* TT */, 780 }, /* Trinidad y Tobago */
-	{ 0x5457 /* TW */, 158 }, /* Taiwan */
-	{ 0x5541 /* UA */, 804 }, /* Ukraine */
-	{ 0x554B /* UK */, 826 }, /* United Kingdom */
-	{ 0x5553 /* US */, 840 }, /* United States */
-	{ 0x5553 /* US */, 842 }, /* United States (Public Safety)*/
-	{ 0x5559 /* UY */, 858 }, /* Uruguay */
-	{ 0x555A /* UZ */, 860 }, /* Uzbekistan */
-	{ 0x5645 /* VE */, 862 }, /* Venezuela */
-	{ 0x564E /* VN */, 704 }, /* Viet Nam */
-	{ 0x5945 /* YE */, 887 }, /* Yemen */
-	{ 0x5A41 /* ZA */, 710 }, /* South Africa */
-	{ 0x5A57 /* ZW */, 716 }, /* Zimbabwe */
-};
-
-
-static int madwifi_wrq(struct iwreq *wrq, const char *ifname, int cmd, void *data, size_t len)
-{
-	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 iwinfo_ioctl(cmd, wrq);
-}
-
-static int get80211priv(const char *ifname, int op, void *data, size_t len)
-{
-	struct iwreq iwr;
-
-	if( madwifi_wrq(&iwr, ifname, op, data, len) < 0 )
-		return -1;
-
-	return iwr.u.data.length;
-}
-
-static char * madwifi_isvap(const char *ifname, const char *wifiname)
-{
-	int fd, ln;
-	char path[32];
-	char *ret = NULL;
-	static char name[IFNAMSIZ];
-
-	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))
-						? NULL : name;
-			}
-			else if( (ln = read(fd, name, IFNAMSIZ)) >= 4 )
-			{
-				name[ln-1] = 0;
-				ret = name;
-			}
-
-			(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;
-}
-
-static char * madwifi_ifadd(const char *ifname)
-{
-	char *wifidev = NULL;
-	struct ifreq ifr = { 0 };
-	struct ieee80211_clone_params cp = { 0 };
-	static char nif[IFNAMSIZ] = { 0 };
-
-	if( !(wifidev = madwifi_isvap(ifname, NULL)) && madwifi_iswifi(ifname) )
-		wifidev = (char *)ifname;
-
-	if( wifidev )
-	{
-		snprintf(nif, sizeof(nif), "tmp.%s", ifname);
-
-		strncpy(cp.icp_name, nif, IFNAMSIZ);
-		cp.icp_opmode = IEEE80211_M_STA;
-		cp.icp_flags  = IEEE80211_CLONE_BSSID;
-
-		strncpy(ifr.ifr_name, wifidev, IFNAMSIZ);
-		ifr.ifr_data  = (void *)&cp;
-
-		if( !iwinfo_ioctl(SIOC80211IFCREATE, &ifr) )
-		{
-			return nif;
-		}
-		else
-		{
-			cp.icp_opmode = IEEE80211_M_MONITOR;
-
-			if( !iwinfo_ioctl(SIOC80211IFCREATE, &ifr) )
-				return nif;
-		}
-	}
-
-	return NULL;
-}
-
-static void madwifi_ifdel(const char *ifname)
-{
-	struct ifreq ifr = { 0 };
-
-	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-	iwinfo_ioctl(SIOC80211IFDESTROY, &ifr);
-}
-
-
-int madwifi_probe(const char *ifname)
-{
-	return ( !!madwifi_isvap(ifname, NULL) || madwifi_iswifi(ifname) );
-}
-
-void madwifi_close(void)
-{
-	/* Nop */
-}
-
-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_wrq(&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_wrq(&wrq, ifname, SIOCGIWFREQ, NULL, 0) >= 0 )
-	{
-		*buf = (uint16_t)(wrq.u.freq.m / 100000);
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_txpower(const char *ifname, int *buf)
-{
-	return wext_get_txpower(ifname, buf);
-}
-
-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_wrq(&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_wrq(&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_wrq(&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_encryption(const char *ifname, char *buf)
-{
-	int ciphers = 0, key_len = 0;
-	char keybuf[IW_ENCODING_TOKEN_MAX];
-	struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
-	struct iwreq wrq;
-	struct ieee80211req_key wk;
-
-	memset(&wrq, 0, sizeof(wrq));
-
-	/* Obtain key info */
-	if( madwifi_wrq(&wrq, ifname, SIOCGIWENCODE, keybuf, sizeof(keybuf)) < 0 )
-		return -1;
-
-#if 0
-	/* Have any encryption? */
-	if( (wrq.u.data.flags & IW_ENCODE_DISABLED) || (wrq.u.data.length == 0) )
-		return 0;
-#endif
-
-	/* Save key len */
-	key_len = wrq.u.data.length;
-
-	/* Get wpa protocol version */
-	wrq.u.mode = IEEE80211_PARAM_WPA;
-	if( madwifi_wrq(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-		c->wpa_version = wrq.u.mode;
-
-	/* Get authentication suites */
-	wrq.u.mode = IEEE80211_PARAM_AUTHMODE;
-	if( madwifi_wrq(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-	{
-		switch(wrq.u.mode) {
-			case IEEE80211_AUTH_8021X:
-				c->auth_suites |= IWINFO_KMGMT_8021x;
-				break;
-
-			case IEEE80211_AUTH_WPA:
-				c->auth_suites |= IWINFO_KMGMT_PSK;
-				break;
-
-			case IEEE80211_AUTH_OPEN:
-				c->auth_algs |= IWINFO_AUTH_OPEN;
-				break;
-
-			case IEEE80211_AUTH_SHARED:
-				c->auth_algs |= IWINFO_AUTH_SHARED;
-				break;
-
-			default:
-				c->auth_suites |= IWINFO_KMGMT_NONE;
-				break;
-		}
-	}
-
-	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 )
-	{
-		/* Type 0 == WEP */
-		if( (wk.ik_type == 0) && (c->auth_algs == 0) )
-			c->auth_algs = (IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED);
-	}
-
-	/* Get used pairwise ciphers */
-	wrq.u.mode = IEEE80211_PARAM_UCASTCIPHERS;
-	if( madwifi_wrq(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-	{
-		ciphers = wrq.u.mode;
-
-		if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_TKIP) )
-			c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-
-		if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_AES_CCM) )
-			c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-
-		if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_AES_OCB) )
-			c->pair_ciphers |= IWINFO_CIPHER_AESOCB;
-
-		if( c->wpa_version && ciphers & (1 << IEEE80211_CIPHER_CKIP) )
-			c->pair_ciphers |= IWINFO_CIPHER_CKIP;
-
-		if( !c->pair_ciphers && ciphers & (1 << IEEE80211_CIPHER_WEP) )
-		{
-			switch(key_len) {
-				case 13:
-					c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-					break;
-
-				case 5:
-					c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-					break;
-
-				case 0:
-					break;
-
-				default:
-					c->pair_ciphers = IWINFO_CIPHER_WEP40 |
-						IWINFO_CIPHER_WEP104;
-					break;
-			}
-		}
-
-		if( ciphers & (1 << IEEE80211_CIPHER_NONE) )
-			c->pair_ciphers |= IWINFO_CIPHER_NONE;
-	}
-
-	/* Get used group cipher */
-	wrq.u.mode = IEEE80211_PARAM_MCASTCIPHER;
-	if( madwifi_wrq(&wrq, ifname, IEEE80211_IOCTL_GETPARAM, NULL, 0) >= 0 )
-	{
-		ciphers = c->wpa_version ? wrq.u.mode : IEEE80211_CIPHER_WEP;
-
-		switch(ciphers) {
-			case IEEE80211_CIPHER_TKIP:
-				c->group_ciphers |= IWINFO_CIPHER_TKIP;
-				break;
-
-			case IEEE80211_CIPHER_AES_CCM:
-				c->group_ciphers |= IWINFO_CIPHER_CCMP;
-				break;
-
-			case IEEE80211_CIPHER_AES_OCB:
-				c->group_ciphers |= IWINFO_CIPHER_AESOCB;
-				break;
-
-			case IEEE80211_CIPHER_CKIP:
-				c->group_ciphers |= IWINFO_CIPHER_CKIP;
-				break;
-
-			case IEEE80211_CIPHER_WEP:
-				switch(key_len) {
-					case 13:
-						c->group_ciphers |= IWINFO_CIPHER_WEP104;
-						break;
-
-					case 5:
-						c->group_ciphers |= IWINFO_CIPHER_WEP40;
-						break;
-
-					default:
-						break;
-				}
-				break;
-
-			case IEEE80211_CIPHER_NONE:
-				c->group_ciphers |= IWINFO_CIPHER_NONE;
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	c->enabled = (c->wpa_version || (c->auth_algs && c->pair_ciphers)) ? 1 : 0;
-
-	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 *res;
-
-	/* A wifiX device? */
-	if( madwifi_iswifi(ifname) )
-	{
-		if( (res = madwifi_ifadd(ifname)) != NULL )
-		{
-			rc = wext_get_txpwrlist(res, buf, len);
-			madwifi_ifdel(res);
-		}
-	}
-
-	/* 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 *res;
-	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) )
-				{
-					if( iwinfo_ifup(e->d_name) )
-					{
-						ret = wext_get_scanlist(e->d_name, buf, len);
-						break;
-					}
-				}
-			}
-
-			closedir(proc);
-		}
-
-		/* Still nothing found, try to create a vap */
-		if( ret == -1 )
-		{
-			if( (res = madwifi_ifadd(ifname)) != NULL )
-			{
-				if( iwinfo_ifup(res) )
-				{
-					wext_get_scanlist(res, buf, len);
-					sleep(1);
-
-					wext_get_scanlist(res, buf, len);
-					sleep(1);
-
-					ret = wext_get_scanlist(res, buf, len);
-				}
-
-				iwinfo_ifdown(res);
-				madwifi_ifdel(res);
-			}
-		}
-	}
-
-	/* 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 *res;
-	struct ieee80211req_chaninfo chans;
-	struct iwinfo_freqlist_entry entry;
-
-	/* A wifiX device? */
-	if( madwifi_iswifi(ifname) )
-	{
-		if( (res = madwifi_ifadd(ifname)) != NULL )
-		{
-			rc = get80211priv(res, IEEE80211_IOCTL_GETCHANINFO,
-							  &chans, sizeof(chans));
-
-			madwifi_ifdel(res);
-		}
-	}
-
-	/* 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;
-			entry.restricted = 0;
-
-			memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
-			bl += sizeof(struct iwinfo_freqlist_entry);
-		}
-
-		*len = bl;
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_country(const char *ifname, char *buf)
-{
-	int i, fd, ccode = -1;
-	char buffer[34];
-	char *wifi = madwifi_iswifi(ifname)
-		? (char *)ifname : madwifi_isvap(ifname, NULL);
-
-	struct ISO3166_to_CCode *e;
-
-	if( wifi )
-	{
-		snprintf(buffer, sizeof(buffer), "/proc/sys/dev/%s/countrycode", wifi);
-
-		if( (fd = open(buffer, O_RDONLY)) > -1 )
-		{
-			memset(buffer, 0, sizeof(buffer));
-
-			if( read(fd, buffer, sizeof(buffer)-1) > 0 )
-				ccode = atoi(buffer);
-
-			close(fd);
-		}
-	}
-
-	for( i = 0; i < (sizeof(CountryCodes)/sizeof(CountryCodes[0])); i++ )
-	{
-		e = &CountryCodes[i];
-
-		if( e->ccode == ccode )
-		{
-			sprintf(buf, "%c%c", e->iso3166 / 256, e->iso3166 % 256);
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-int madwifi_get_countrylist(const char *ifname, char *buf, int *len)
-{
-	int i, count;
-	struct ISO3166_to_CCode *e, *p = NULL;
-	struct iwinfo_country_entry *c = (struct iwinfo_country_entry *)buf;
-
-	count = 0;
-
-	for( int i = 0; i < (sizeof(CountryCodes)/sizeof(CountryCodes[0])); i++ )
-	{
-		e = &CountryCodes[i];
-
-		if( !p || (e->iso3166 != p->iso3166) )
-		{
-			c->iso3166 = e->iso3166;
-			snprintf(c->ccode, sizeof(c->ccode), "%i", e->ccode);
-
-			c++;
-			count++;
-		}
-
-		p = e;
-	}
-
-	*len = (count * sizeof(struct iwinfo_country_entry));
-	return 0;
-}
-
-int madwifi_get_hwmodelist(const char *ifname, int *buf)
-{
-	char chans[IWINFO_BUFSIZE] = { 0 };
-	struct iwinfo_freqlist_entry *e = NULL;
-	int len = 0;
-
-	if( !madwifi_get_freqlist(ifname, chans, &len) )
-	{
-		for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )
-		{
-			if( e->channel <= 14 )
-			{
-				*buf |= IWINFO_80211_B;
-				*buf |= IWINFO_80211_G;
-			}
-			else
-			{
-				*buf |= IWINFO_80211_A;
-			}
-		}
-
-		return 0;
-	}
-
-	return -1;
-}
-
-int madwifi_get_mbssid_support(const char *ifname, int *buf)
-{
-	/* Test whether we can create another interface */
-	char *nif = madwifi_ifadd(ifname);
-
-	if( nif )
-	{
-		*buf = iwinfo_ifup(nif);
-
-		iwinfo_ifdown(nif);
-		madwifi_ifdel(nif);
-
-		return 0;
-	}
-
-	return -1;
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_nl80211.c b/contrib/package/iwinfo/src/iwinfo_nl80211.c
deleted file mode 100644
index b3da8384e..000000000
--- a/contrib/package/iwinfo/src/iwinfo_nl80211.c
+++ /dev/null
@@ -1,1630 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - NL80211 Backend
- *
- *   Copyright (C) 2010 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.
- *
- * Parts of this code are derived from the Linux iw utility.
- */
-
-#include "iwinfo/nl80211.h"
-#include "iwinfo/wext.h"
-
-#define min(x, y) ((x) < (y)) ? (x) : (y)
-
-static struct nl80211_state *nls = NULL;
-
-static int nl80211_init(void)
-{
-	int err, fd;
-
-	if (!nls)
-	{
-		nls = malloc(sizeof(struct nl80211_state));
-		if (!nls) {
-			err = -ENOMEM;
-			goto err;
-		}
-
-		nls->nl_sock = nl_socket_alloc();
-		if (!nls->nl_sock) {
-			err = -ENOMEM;
-			goto err;
-		}
-
-		if( genl_connect(nls->nl_sock)) {
-			err = -ENOLINK;
-			goto err;
-		}
-
-		fd = nl_socket_get_fd(nls->nl_sock);
-		if (fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC) < 0)
-		{
-			err = -EINVAL;
-			goto err;
-		}
-
-		if( genl_ctrl_alloc_cache(nls->nl_sock, &nls->nl_cache)) {
-			err = -ENOMEM;
-			goto err;
-		}
-
-		nls->nl80211 = genl_ctrl_search_by_name(nls->nl_cache, "nl80211");
-		if (!nls->nl80211)
-		{
-			err = -ENOENT;
-			goto err;
-		}
-	}
-
-	return 0;
-
-
-err:
-	nl80211_close();
-	return err;
-}
-
-static int nl80211_msg_error(struct sockaddr_nl *nla,
-	struct nlmsgerr *err, void *arg)
-{
-	int *ret = arg;
-	*ret = err->error;
-	return NL_STOP;
-}
-
-static int nl80211_msg_finish(struct nl_msg *msg, void *arg)
-{
-	int *ret = arg;
-	*ret = 0;
-	return NL_SKIP;
-}
-
-static int nl80211_msg_ack(struct nl_msg *msg, void *arg)
-{
-	int *ret = arg;
-	*ret = 0;
-	return NL_STOP;
-}
-
-static int nl80211_msg_response(struct nl_msg *msg, void *arg)
-{
-	return NL_SKIP;
-}
-
-static void nl80211_free(struct nl80211_msg_conveyor *cv)
-{
-	if (cv)
-	{
-		if (cv->cb)
-			nl_cb_put(cv->cb);
-
-		if (cv->msg)
-			nlmsg_free(cv->msg);
-
-		cv->cb  = NULL;
-		cv->msg = NULL;
-	}
-}
-
-static struct nl80211_msg_conveyor * nl80211_msg(const char *ifname, int cmd, int flags)
-{
-	static struct nl80211_msg_conveyor cv;
-
-	int ifidx = -1, phyidx = -1;
-	struct nl_msg *req = NULL;
-	struct nl_cb *cb = NULL;
-
-	if (nl80211_init() < 0)
-		goto err;
-
-	if (!strncmp(ifname, "phy", 3))
-		phyidx = atoi(&ifname[3]);
-	else if (!strncmp(ifname, "radio", 5))
-		phyidx = atoi(&ifname[5]);
-	else if (!strncmp(ifname, "mon.", 4))
-		ifidx = if_nametoindex(&ifname[4]);
-	else
-		ifidx = if_nametoindex(ifname);
-
-	if ((ifidx < 0) && (phyidx < 0))
-		return NULL;
-
-	req = nlmsg_alloc();
-	if (!req)
-		goto err;
-
-	cb = nl_cb_alloc(NL_CB_DEFAULT);
-	if (!cb)
-		goto err;
-
-	genlmsg_put(req, 0, 0, genl_family_get_id(nls->nl80211), 0,
-		flags, cmd, 0);
-
-	if (ifidx > -1)
-		NLA_PUT_U32(req, NL80211_ATTR_IFINDEX, ifidx);
-
-	if (phyidx > -1)
-		NLA_PUT_U32(req, NL80211_ATTR_WIPHY, phyidx);
-
-	cv.msg = req;
-	cv.cb  = cb;
-
-	return &cv;
-
-err:
-nla_put_failure:
-	if (cb)
-		nl_cb_put(cb);
-
-	if (req)
-		nlmsg_free(req);
-
-	return NULL;
-}
-
-static struct nl80211_msg_conveyor * nl80211_send(
-	struct nl80211_msg_conveyor *cv,
-	int (*cb_func)(struct nl_msg *, void *), void *cb_arg
-) {
-	static struct nl80211_msg_conveyor rcv;
-	int err = 1;
-
-	if (cb_func)
-		nl_cb_set(cv->cb, NL_CB_VALID, NL_CB_CUSTOM, cb_func, cb_arg);
-	else
-		nl_cb_set(cv->cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_msg_response, &rcv);
-
-	if (nl_send_auto_complete(nls->nl_sock, cv->msg) < 0)
-		goto err;
-
-	nl_cb_err(cv->cb,               NL_CB_CUSTOM, nl80211_msg_error,  &err);
-	nl_cb_set(cv->cb, NL_CB_FINISH, NL_CB_CUSTOM, nl80211_msg_finish, &err);
-	nl_cb_set(cv->cb, NL_CB_ACK,    NL_CB_CUSTOM, nl80211_msg_ack,    &err);
-
-	while (err > 0)
-		nl_recvmsgs(nls->nl_sock, cv->cb);
-
-	return &rcv;
-
-err:
-	nl_cb_put(cv->cb);
-	nlmsg_free(cv->msg);
-
-	return NULL;
-}
-
-static struct nlattr ** nl80211_parse(struct nl_msg *msg)
-{
-	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	static struct nlattr *attr[NL80211_ATTR_MAX + 1];
-
-	nla_parse(attr, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
-		genlmsg_attrlen(gnlh, 0), NULL);
-
-	return attr;
-}
-
-static int nl80211_freq2channel(int freq)
-{
-    if (freq == 2484)
-        return 14;
-
-    if (freq < 2484)
-        return (freq - 2407) / 5;
-
-    return (freq / 5) - 1000;
-}
-
-static char * nl80211_getval(const char *ifname, const char *buf, const char *key)
-{
-	int i, len;
-	char lkey[64] = { 0 };
-	const char *ln = buf;
-	static char lval[256] = { 0 };
-
-	int matched_if = ifname ? 0 : 1;
-
-
-	for( i = 0, len = strlen(buf); i < len; i++ )
-	{
-		if (!lkey[0] && (buf[i] == ' ' || buf[i] == '\t'))
-		{
-			ln++;
-		}
-		else if (!lkey[0] && (buf[i] == '='))
-		{
-			if ((&buf[i] - ln) > 0)
-				memcpy(lkey, ln, min(sizeof(lkey) - 1, &buf[i] - ln));
-		}
-		else if (buf[i] == '\n')
-		{
-			if (lkey[0])
-			{
-				memcpy(lval, ln + strlen(lkey) + 1,
-					min(sizeof(lval) - 1, &buf[i] - ln - strlen(lkey) - 1));
-
-				if ((ifname != NULL) &&
-				    (!strcmp(lkey, "interface") || !strcmp(lkey, "bss")) )
-				{
-					matched_if = !strcmp(lval, ifname);
-				}
-				else if (matched_if && !strcmp(lkey, key))
-				{
-					return lval;
-				}
-			}
-
-			ln = &buf[i+1];
-			memset(lkey, 0, sizeof(lkey));
-			memset(lval, 0, sizeof(lval));
-		}
-	}
-
-	return NULL;
-}
-
-static int nl80211_ifname2phy_cb(struct nl_msg *msg, void *arg)
-{
-	char *buf = arg;
-	struct nlattr **attr = nl80211_parse(msg);
-
-	if (attr[NL80211_ATTR_WIPHY_NAME])
-		sprintf(buf, "%s", nla_data(attr[NL80211_ATTR_WIPHY_NAME]));
-	else
-		buf[0] = 0;
-
-	return NL_SKIP;
-}
-
-static char * nl80211_ifname2phy(const char *ifname)
-{
-	static char phy[32] = { 0 };
-	struct nl80211_msg_conveyor *req;
-
-	memset(phy, 0, sizeof(phy));
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
-	if (req)
-	{
-		nl80211_send(req, nl80211_ifname2phy_cb, phy);
-		nl80211_free(req);
-	}
-
-	return phy[0] ? phy : NULL;
-}
-
-static char * nl80211_hostapd_info(const char *ifname)
-{
-	char *phy;
-	char path[32] = { 0 };
-	static char buf[4096] = { 0 };
-	FILE *conf;
-
-	if ((phy = nl80211_ifname2phy(ifname)) != NULL)
-	{
-		snprintf(path, sizeof(path), "/var/run/hostapd-%s.conf", phy);
-
-		if ((conf = fopen(path, "r")) != NULL)
-		{
-			fread(buf, sizeof(buf) - 1, 1, conf);
-			fclose(conf);
-
-			return buf;
-		}
-	}
-
-	return NULL;
-}
-
-static inline int nl80211_wpactl_recv(int sock, char *buf, int blen)
-{
-	fd_set rfds;
-	struct timeval tv = { 2, 0 };
-
-	FD_ZERO(&rfds);
-	FD_SET(sock, &rfds);
-
-	memset(buf, 0, blen);
-
-
-	if (select(sock + 1, &rfds, NULL, NULL, &tv) < 0)
-		return -1;
-
-	if (!FD_ISSET(sock, &rfds))
-		return -1;
-
-	return recv(sock, buf, blen, 0);
-}
-
-static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
-								   const char *event)
-{
-	int numtry = 0;
-	int sock = -1;
-	char *rv = NULL;
-	size_t remote_length, local_length;
-	static char buffer[10240] = { 0 };
-
-	struct sockaddr_un local = { 0 };
-	struct sockaddr_un remote = { 0 };
-
-
-	sock = socket(PF_UNIX, SOCK_DGRAM, 0);
-	if (sock < 0)
-		return NULL;
-
-	remote.sun_family = AF_UNIX;
-	remote_length = sizeof(remote.sun_family) + sprintf(remote.sun_path,
-		"/var/run/wpa_supplicant-%s/%s", ifname, ifname);
-
-	if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0)
-		goto out;
-
-	if (connect(sock, (struct sockaddr *) &remote, remote_length))
-		goto out;
-
-	local.sun_family = AF_UNIX;
-	local_length = sizeof(local.sun_family) + sprintf(local.sun_path,
-		"/var/run/iwinfo-%s-%d", ifname, getpid());
-
-	if (bind(sock, (struct sockaddr *) &local, local_length))
-		goto out;
-
-
-	send(sock, "ATTACH", 6, 0);
-
-	if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
-		goto out;
-
-
-	send(sock, cmd, strlen(cmd), 0);
-
-	while( numtry++ < 5 )
-	{
-		if (nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0)
-		{
-			if (event)
-				continue;
-
-			break;
-		}
-
-		if ((!event && buffer[0] != '<') || strstr(buffer, event))
-			break;
-	}
-
-	rv = buffer;
-
-out:
-	close(sock);
-
-	if (local.sun_family)
-		unlink(local.sun_path);
-
-	return rv;
-}
-
-static inline int nl80211_readint(const char *path)
-{
-	int fd;
-	int rv = -1;
-	char buffer[16];
-
-	if ((fd = open(path, O_RDONLY)) > -1)
-	{
-		if (read(fd, buffer, sizeof(buffer)) > 0)
-			rv = atoi(buffer);
-
-		close(fd);
-	}
-
-	return rv;
-}
-
-static char * nl80211_phy2ifname(const char *ifname)
-{
-	int fd, ifidx = -1, cifidx = -1, phyidx = -1;
-	char buffer[64];
-	static char nif[IFNAMSIZ] = { 0 };
-
-	DIR *d;
-	struct dirent *e;
-
-	if (!ifname)
-		return NULL;
-	else if (!strncmp(ifname, "phy", 3))
-		phyidx = atoi(&ifname[3]);
-	else if (!strncmp(ifname, "radio", 5))
-		phyidx = atoi(&ifname[5]);
-
-	memset(nif, 0, sizeof(nif));
-
-	if (phyidx > -1)
-	{
-		if ((d = opendir("/sys/class/net")) != NULL)
-		{
-			while( (e = readdir(d)) != NULL )
-			{
-				snprintf(buffer, sizeof(buffer),
-					"/sys/class/net/%s/phy80211/index", e->d_name);
-
-				if (nl80211_readint(buffer) == phyidx)
-				{
-					snprintf(buffer, sizeof(buffer),
-						"/sys/class/net/%s/ifindex", e->d_name);
-
-					if( (cifidx = nl80211_readint(buffer)) >= 0 &&
-					    ((ifidx < 0) || (cifidx < ifidx)) )
-					{
-						ifidx = cifidx;
-						strncpy(nif, e->d_name, sizeof(nif));
-					}
-				}
-			}
-
-			closedir(d);
-		}
-	}
-
-	return nif[0] ? nif : NULL;
-}
-
-static char * nl80211_ifadd(const char *ifname)
-{
-	int phyidx;
-	char *rv = NULL;
-	static char nif[IFNAMSIZ] = { 0 };
-	struct nl80211_msg_conveyor *req, *res;
-
-	req = nl80211_msg(ifname, NL80211_CMD_NEW_INTERFACE, 0);
-	if (req)
-	{
-		snprintf(nif, sizeof(nif), "tmp.%s", ifname);
-
-		NLA_PUT_STRING(req->msg, NL80211_ATTR_IFNAME, nif);
-		NLA_PUT_U32(req->msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_STATION);
-
-		nl80211_send(req, NULL, NULL);
-
-		rv = nif;
-
-	nla_put_failure:
-		nl80211_free(req);
-	}
-
-	return rv;
-}
-
-static void nl80211_ifdel(const char *ifname)
-{
-	struct nl80211_msg_conveyor *req;
-
-	req = nl80211_msg(ifname, NL80211_CMD_DEL_INTERFACE, 0);
-	if (req)
-	{
-		NLA_PUT_STRING(req->msg, NL80211_ATTR_IFNAME, ifname);
-
-		nl80211_send(req, NULL, NULL);
-
-	nla_put_failure:
-		nl80211_free(req);
-	}
-}
-
-static void nl80211_hostapd_hup(const char *ifname)
-{
-	int fd, pid = 0;
-	char buf[32];
-	char *phy = nl80211_ifname2phy(ifname);
-
-	if (phy)
-	{
-		snprintf(buf, sizeof(buf), "/var/run/wifi-%s.pid", phy);
-		if ((fd = open(buf, O_RDONLY)) > 0)
-		{
-			if (read(fd, buf, sizeof(buf)) > 0)
-				pid = atoi(buf);
-
-			close(fd);
-		}
-
-		if (pid > 0)
-			kill(pid, 1);
-	}
-}
-
-
-int nl80211_probe(const char *ifname)
-{
-	return !!nl80211_ifname2phy(ifname);
-}
-
-void nl80211_close(void)
-{
-	if (nls)
-	{
-		if (nls->nl_sock)
-			nl_socket_free(nls->nl_sock);
-
-		if (nls->nl_cache)
-			nl_cache_free(nls->nl_cache);
-
-		free(nls);
-		nls = NULL;
-	}
-}
-
-int nl80211_get_mode(const char *ifname, char *buf)
-{
-	return wext_get_mode(ifname, buf);
-}
-
-int nl80211_get_ssid(const char *ifname, char *buf)
-{
-	char *ssid;
-
-	if (!wext_get_ssid(ifname, buf))
-	{
-		return 0;
-	}
-	else if( (ssid = nl80211_hostapd_info(ifname)) &&
-	         (ssid = nl80211_getval(ifname, ssid, "ssid")) )
-	{
-		memcpy(buf, ssid, strlen(ssid));
-		return 0;
-	}
-
-	return -1;
-}
-
-int nl80211_get_bssid(const char *ifname, char *buf)
-{
-	char *bssid;
-	unsigned char mac[6];
-
-	if (!wext_get_bssid(ifname, buf))
-	{
-		return 0;
-	}
-	else if((bssid = nl80211_hostapd_info(ifname)) &&
-	         (bssid = nl80211_getval(ifname, bssid, "bssid")))
-	{
-		mac[0] = strtol(&bssid[0],  NULL, 16);
-		mac[1] = strtol(&bssid[3],  NULL, 16);
-		mac[2] = strtol(&bssid[6],  NULL, 16);
-		mac[3] = strtol(&bssid[9],  NULL, 16);
-		mac[4] = strtol(&bssid[12], NULL, 16);
-		mac[5] = strtol(&bssid[15], NULL, 16);
-
-		sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
-			mac[0], mac[1], mac[2],	mac[3], mac[4], mac[5]);
-
-		return 0;
-	}
-
-	return -1;
-}
-
-int nl80211_get_channel(const char *ifname, int *buf)
-{
-	char *first;
-
-	if (!wext_get_channel(ifname, buf))
-		return 0;
-
-	else if ((first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL)
-		return wext_get_channel(first, buf);
-
-	return -1;
-}
-
-int nl80211_get_frequency(const char *ifname, int *buf)
-{
-	char *first;
-
-	if (!wext_get_frequency(ifname, buf))
-		return 0;
-
-	else if ((first = nl80211_phy2ifname(nl80211_ifname2phy(ifname))) != NULL)
-		return wext_get_frequency(first, buf);
-
-	return -1;
-}
-
-int nl80211_get_txpower(const char *ifname, int *buf)
-{
-	return wext_get_txpower(ifname, buf);
-}
-
-
-static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg)
-{
-	int8_t dbm;
-	int16_t mbit;
-	struct nl80211_rssi_rate *rr = arg;
-	struct nlattr **attr = nl80211_parse(msg);
-	struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1];
-	struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
-
-	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
-		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32    },
-		[NL80211_STA_INFO_RX_BYTES]      = { .type = NLA_U32    },
-		[NL80211_STA_INFO_TX_BYTES]      = { .type = NLA_U32    },
-		[NL80211_STA_INFO_RX_PACKETS]    = { .type = NLA_U32    },
-		[NL80211_STA_INFO_TX_PACKETS]    = { .type = NLA_U32    },
-		[NL80211_STA_INFO_SIGNAL]        = { .type = NLA_U8     },
-		[NL80211_STA_INFO_TX_BITRATE]    = { .type = NLA_NESTED },
-		[NL80211_STA_INFO_LLID]          = { .type = NLA_U16    },
-		[NL80211_STA_INFO_PLID]          = { .type = NLA_U16    },
-		[NL80211_STA_INFO_PLINK_STATE]   = { .type = NLA_U8     },
-	};
-
-	static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
-		[NL80211_RATE_INFO_BITRATE]      = { .type = NLA_U16  },
-		[NL80211_RATE_INFO_MCS]          = { .type = NLA_U8   },
-		[NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
-		[NL80211_RATE_INFO_SHORT_GI]     = { .type = NLA_FLAG },
-	};
-
-	if (attr[NL80211_ATTR_STA_INFO])
-	{
-		if( !nla_parse_nested(sinfo, NL80211_STA_INFO_MAX,
-				attr[NL80211_ATTR_STA_INFO], stats_policy) )
-		{
-			if (sinfo[NL80211_STA_INFO_SIGNAL])
-			{
-				dbm = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]);
-				rr->rssi = rr->rssi ? (int8_t)((rr->rssi + dbm) / 2) : dbm;
-			}
-
-			if (sinfo[NL80211_STA_INFO_TX_BITRATE])
-			{
-				if( !nla_parse_nested(rinfo, NL80211_RATE_INFO_MAX,
-						sinfo[NL80211_STA_INFO_TX_BITRATE], rate_policy) )
-				{
-					if (rinfo[NL80211_RATE_INFO_BITRATE])
-					{
-						mbit = nla_get_u16(rinfo[NL80211_RATE_INFO_BITRATE]);
-						rr->rate = rr->rate
-							? (int16_t)((rr->rate + mbit) / 2) : mbit;
-					}
-				}
-			}
-		}
-	}
-
-	return NL_SKIP;
-}
-
-static void nl80211_fill_signal(const char *ifname, struct nl80211_rssi_rate *r)
-{
-	DIR *d;
-	struct dirent *de;
-	struct nl80211_msg_conveyor *req;
-
-	r->rssi = 0;
-	r->rate = 0;
-
-	if ((d = opendir("/sys/class/net")) != NULL)
-	{
-		while ((de = readdir(d)) != NULL)
-		{
-			if (!strncmp(de->d_name, ifname, strlen(ifname)) &&
-				(!de->d_name[strlen(ifname)] ||
-				 !strncmp(&de->d_name[strlen(ifname)], ".sta", 4)))
-			{
-				req = nl80211_msg(de->d_name, NL80211_CMD_GET_STATION,
-								  NLM_F_DUMP);
-
-				if (req)
-				{
-					nl80211_send(req, nl80211_fill_signal_cb, r);
-					nl80211_free(req);
-				}
-			}
-		}
-
-		closedir(d);
-	}
-}
-
-int nl80211_get_bitrate(const char *ifname, int *buf)
-{
-	struct nl80211_rssi_rate rr;
-
-	if (!wext_get_bitrate(ifname, buf))
-		return 0;
-
-	nl80211_fill_signal(ifname, &rr);
-
-	if (rr.rate)
-	{
-		*buf = (rr.rate * 100);
-		return 0;
-	}
-
-	return -1;
-}
-
-int nl80211_get_signal(const char *ifname, int *buf)
-{
-	struct nl80211_rssi_rate rr;
-
-	if (!wext_get_signal(ifname, buf))
-		return 0;
-
-	nl80211_fill_signal(ifname, &rr);
-
-	if (rr.rssi)
-	{
-		*buf = rr.rssi;
-		return 0;
-	}
-
-	return -1;
-}
-
-static int nl80211_get_noise_cb(struct nl_msg *msg, void *arg)
-{
-	int8_t *noise = arg;
-	struct nlattr **tb = nl80211_parse(msg);
-	struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1];
-
-	static struct nla_policy sp[NL80211_SURVEY_INFO_MAX + 1] = {
-		[NL80211_SURVEY_INFO_FREQUENCY] = { .type = NLA_U32 },
-		[NL80211_SURVEY_INFO_NOISE]     = { .type = NLA_U8  },
-	};
-
-	if (!tb[NL80211_ATTR_SURVEY_INFO])
-		return NL_SKIP;
-
-	if (nla_parse_nested(si, NL80211_SURVEY_INFO_MAX,
-						 tb[NL80211_ATTR_SURVEY_INFO], sp))
-		return NL_SKIP;
-
-	if (!si[NL80211_SURVEY_INFO_NOISE])
-		return NL_SKIP;
-
-	if (!*noise || si[NL80211_SURVEY_INFO_IN_USE])
-		*noise = (int8_t)nla_get_u8(si[NL80211_SURVEY_INFO_NOISE]);
-
-	return NL_SKIP;
-}
-
-
-int nl80211_get_noise(const char *ifname, int *buf)
-{
-	int8_t noise;
-	struct nl80211_msg_conveyor *req;
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_SURVEY, NLM_F_DUMP);
-	if (req)
-	{
-		noise = 0;
-
-		nl80211_send(req, nl80211_get_noise_cb, &noise);
-		nl80211_free(req);
-
-		if (noise)
-		{
-			*buf = noise;
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-int nl80211_get_quality(const char *ifname, int *buf)
-{
-	int signal;
-
-	if (wext_get_quality(ifname, buf))
-	{
-		*buf = 0;
-
-		if (!nl80211_get_signal(ifname, &signal))
-		{
-			/* A positive signal level is usually just a quality
-			 * value, pass through as-is */
-			if (signal >= 0)
-			{
-				*buf = signal;
-			}
-
-			/* The cfg80211 wext compat layer assumes a signal range
-			 * of -110 dBm to -40 dBm, the quality value is derived
-			 * by adding 110 to the signal level */
-			else
-			{
-				if (signal < -110)
-					signal = -110;
-				else if (signal > -40)
-					signal = -40;
-
-				*buf = (signal + 110);
-			}
-		}
-	}
-
-	return 0;
-}
-
-int nl80211_get_quality_max(const char *ifname, int *buf)
-{
-	if (wext_get_quality_max(ifname, buf))
-		/* The cfg80211 wext compat layer assumes a maximum
-		 * quality of 70 */
-		*buf = 70;
-
-	return 0;
-}
-
-int nl80211_get_encryption(const char *ifname, char *buf)
-{
-	int i;
-	char k[9];
-	char *val, *res;
-	struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
-
-	/* WPA supplicant */
-	if( (res = nl80211_wpactl_info(ifname, "STATUS", NULL)) &&
-	    (val = nl80211_getval(NULL, res, "pairwise_cipher")) )
-	{
-		/* WEP */
-		if (strstr(val, "WEP"))
-		{
-			if (strstr(val, "WEP-40"))
-				c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-
-			else if (strstr(val, "WEP-104"))
-				c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-
-			c->enabled       = 1;
-			c->group_ciphers = c->pair_ciphers;
-
-			c->auth_suites |= IWINFO_KMGMT_NONE;
-			c->auth_algs   |= IWINFO_AUTH_OPEN; /* XXX: assumption */
-		}
-
-		/* WPA */
-		else
-		{
-			if (strstr(val, "TKIP"))
-				c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-
-			else if (strstr(val, "CCMP"))
-				c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-
-			else if (strstr(val, "NONE"))
-				c->pair_ciphers |= IWINFO_CIPHER_NONE;
-
-			else if (strstr(val, "WEP-40"))
-				c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-
-			else if (strstr(val, "WEP-104"))
-				c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-
-
-			if ((val = nl80211_getval(NULL, res, "group_cipher")))
-			{
-				if (strstr(val, "TKIP"))
-					c->group_ciphers |= IWINFO_CIPHER_TKIP;
-
-				else if (strstr(val, "CCMP"))
-					c->group_ciphers |= IWINFO_CIPHER_CCMP;
-
-				else if (strstr(val, "NONE"))
-					c->group_ciphers |= IWINFO_CIPHER_NONE;
-
-				else if (strstr(val, "WEP-40"))
-					c->group_ciphers |= IWINFO_CIPHER_WEP40;
-
-				else if (strstr(val, "WEP-104"))
-					c->group_ciphers |= IWINFO_CIPHER_WEP104;
-			}
-
-
-			if ((val = nl80211_getval(NULL, res, "key_mgmt")))
-			{
-				if (strstr(val, "WPA2"))
-					c->wpa_version = 2;
-
-				else if (strstr(val, "WPA"))
-					c->wpa_version = 1;
-
-
-				if (strstr(val, "PSK"))
-					c->auth_suites |= IWINFO_KMGMT_PSK;
-
-				else if (strstr(val, "EAP") || strstr(val, "802.1X"))
-					c->auth_suites |= IWINFO_KMGMT_8021x;
-
-				else if (strstr(val, "NONE"))
-					c->auth_suites |= IWINFO_KMGMT_NONE;
-			}
-
-			c->enabled = (c->wpa_version && c->auth_suites) ? 1 : 0;
-		}
-
-		return 0;
-	}
-
-	/* Hostapd */
-	else if ((res = nl80211_hostapd_info(ifname)))
-	{
-		if ((val = nl80211_getval(ifname, res, "wpa")) != NULL)
-			c->wpa_version = atoi(val);
-
-		val = nl80211_getval(ifname, res, "wpa_key_mgmt");
-
-		if (!val || strstr(val, "PSK"))
-			c->auth_suites |= IWINFO_KMGMT_PSK;
-
-		if (val && strstr(val, "EAP"))
-			c->auth_suites |= IWINFO_KMGMT_8021x;
-
-		if (val && strstr(val, "NONE"))
-			c->auth_suites |= IWINFO_KMGMT_NONE;
-
-		if ((val = nl80211_getval(ifname, res, "wpa_pairwise")) != NULL)
-		{
-			if (strstr(val, "TKIP"))
-				c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-
-			if (strstr(val, "CCMP"))
-				c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-
-			if (strstr(val, "NONE"))
-				c->pair_ciphers |= IWINFO_CIPHER_NONE;
-		}
-
-		if ((val = nl80211_getval(ifname, res, "auth_algs")) != NULL)
-		{
-			switch(atoi(val)) {
-				case 1:
-					c->auth_algs |= IWINFO_AUTH_OPEN;
-					break;
-
-				case 2:
-					c->auth_algs |= IWINFO_AUTH_SHARED;
-					break;
-
-				case 3:
-					c->auth_algs |= IWINFO_AUTH_OPEN;
-					c->auth_algs |= IWINFO_AUTH_SHARED;
-					break;
-
-				default:
-					break;
-			}
-
-			for( i = 0; i < 4; i++ )
-			{
-				snprintf(k, sizeof(k), "wep_key%d", i);
-
-				if ((val = nl80211_getval(ifname, res, k)))
-				{
-					if ((strlen(val) == 5) || (strlen(val) == 10))
-						c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-
-					else if ((strlen(val) == 13) || (strlen(val) == 26))
-						c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-				}
-			}
-		}
-
-		c->group_ciphers = c->pair_ciphers;
-		c->enabled = (c->wpa_version || c->pair_ciphers) ? 1 : 0;
-
-		return 0;
-	}
-
-	return -1;
-}
-
-
-static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg)
-{
-	struct nl80211_array_buf *arr = arg;
-	struct iwinfo_assoclist_entry *e = arr->buf;
-	struct nlattr **attr = nl80211_parse(msg);
-	struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1];
-
-	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
-		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32    },
-		[NL80211_STA_INFO_RX_BYTES]      = { .type = NLA_U32    },
-		[NL80211_STA_INFO_TX_BYTES]      = { .type = NLA_U32    },
-		[NL80211_STA_INFO_RX_PACKETS]    = { .type = NLA_U32    },
-		[NL80211_STA_INFO_TX_PACKETS]    = { .type = NLA_U32    },
-		[NL80211_STA_INFO_SIGNAL]        = { .type = NLA_U8     },
-		[NL80211_STA_INFO_TX_BITRATE]    = { .type = NLA_NESTED },
-		[NL80211_STA_INFO_LLID]          = { .type = NLA_U16    },
-		[NL80211_STA_INFO_PLID]          = { .type = NLA_U16    },
-		[NL80211_STA_INFO_PLINK_STATE]   = { .type = NLA_U8     },
-	};
-
-	/* advance to end of array */
-	e += arr->count;
-
-	if (attr[NL80211_ATTR_MAC])
-		memcpy(e->mac, nla_data(attr[NL80211_ATTR_MAC]), 6);
-
-	if (attr[NL80211_ATTR_STA_INFO])
-	{
-		if (!nla_parse_nested(sinfo, NL80211_STA_INFO_MAX,
-				attr[NL80211_ATTR_STA_INFO], stats_policy))
-		{
-			if (sinfo[NL80211_STA_INFO_SIGNAL])
-				e->signal = nla_get_u8(sinfo[NL80211_STA_INFO_SIGNAL]);
-		}
-	}
-
-	e->noise = 0; /* filled in by caller */
-	arr->count++;
-
-	return NL_SKIP;
-}
-
-int nl80211_get_assoclist(const char *ifname, char *buf, int *len)
-{
-	DIR *d;
-	int i, noise = 0;
-	struct dirent *de;
-	struct nl80211_msg_conveyor *req;
-	struct nl80211_array_buf arr = { .buf = buf, .count = 0 };
-	struct iwinfo_assoclist_entry *e;
-
-	if ((d = opendir("/sys/class/net")) != NULL)
-	{
-		while ((de = readdir(d)) != NULL)
-		{
-			if (!strncmp(de->d_name, ifname, strlen(ifname)) &&
-				(!de->d_name[strlen(ifname)] ||
-				 !strncmp(&de->d_name[strlen(ifname)], ".sta", 4)))
-			{
-				req = nl80211_msg(de->d_name, NL80211_CMD_GET_STATION,
-								  NLM_F_DUMP);
-
-				if (req)
-				{
-					nl80211_send(req, nl80211_get_assoclist_cb, &arr);
-					nl80211_free(req);
-				}
-
-				break;
-			}
-		}
-
-		closedir(d);
-
-		if (!nl80211_get_noise(ifname, &noise))
-			for (i = 0, e = arr.buf; i < arr.count; i++, e++)
-				e->noise = noise;
-
-		*len = (arr.count * sizeof(struct iwinfo_assoclist_entry));
-		return 0;
-	}
-
-	return -1;
-}
-
-static int nl80211_get_txpwrlist_cb(struct nl_msg *msg, void *arg)
-{
-	int *dbm_max = arg;
-	int ch_cur, ch_cmp, bands_remain, freqs_remain;
-
-	struct nlattr **attr = nl80211_parse(msg);
-	struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1];
-	struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1];
-	struct nlattr *band, *freq;
-
-	static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
-		[NL80211_FREQUENCY_ATTR_FREQ]         = { .type = NLA_U32  },
-		[NL80211_FREQUENCY_ATTR_DISABLED]     = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_NO_IBSS]      = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_RADAR]        = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32  },
-	};
-
-	ch_cur = *dbm_max; /* value int* is initialized with channel by caller */
-	*dbm_max = -1;
-
-	nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
-	{
-		nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band),
-			  nla_len(band), NULL);
-
-		nla_for_each_nested(freq,
-			bands[NL80211_BAND_ATTR_FREQS], freqs_remain)
-		{
-			nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
-				nla_data(freq), nla_len(freq), freq_policy);
-
-			ch_cmp = nl80211_freq2channel(
-				nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]));
-
-			if( (!ch_cur || (ch_cmp == ch_cur)) &&
-				freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] )
-			{
-				*dbm_max = (int)(0.01 * nla_get_u32(
-					freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER]));
-
-				break;
-			}
-		}
-	}
-
-	return NL_SKIP;
-}
-
-int nl80211_get_txpwrlist(const char *ifname, char *buf, int *len)
-{
-	int ch_cur;
-	int dbm_max = -1, dbm_cur, dbm_cnt;
-	struct nl80211_msg_conveyor *req;
-	struct iwinfo_txpwrlist_entry entry;
-
-	if (nl80211_get_channel(ifname, &ch_cur))
-		ch_cur = 0;
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
-	if (req)
-	{
-		/* initialize the value pointer with channel for callback */
-		dbm_max = ch_cur;
-
-		nl80211_send(req, nl80211_get_txpwrlist_cb, &dbm_max);
-		nl80211_free(req);
-	}
-
-	if (dbm_max > -1)
-	{
-		for (dbm_cur = 0, dbm_cnt = 0;
-		     dbm_cur < dbm_max;
-		     dbm_cur++, dbm_cnt++)
-		{
-			entry.dbm = dbm_cur;
-			entry.mw  = iwinfo_dbm2mw(dbm_cur);
-
-			memcpy(&buf[dbm_cnt * sizeof(entry)], &entry, sizeof(entry));
-		}
-
-		entry.dbm = dbm_max;
-		entry.mw  = iwinfo_dbm2mw(dbm_max);
-
-		memcpy(&buf[dbm_cnt * sizeof(entry)], &entry, sizeof(entry));
-		dbm_cnt++;
-
-		*len = dbm_cnt * sizeof(entry);
-		return 0;
-	}
-
-	return -1;
-}
-
-static void nl80211_get_scancrypto(const char *spec,
-	struct iwinfo_crypto_entry *c)
-{
-	if (strstr(spec, "WPA") || strstr(spec, "WEP"))
-	{
-		c->enabled = 1;
-
-		if (strstr(spec, "WPA2-") && strstr(spec, "WPA-"))
-			c->wpa_version = 3;
-
-		else if (strstr(spec, "WPA2"))
-			c->wpa_version = 2;
-
-		else if (strstr(spec, "WPA"))
-			c->wpa_version = 1;
-
-		else if (strstr(spec, "WEP"))
-			c->auth_algs = IWINFO_AUTH_OPEN | IWINFO_AUTH_SHARED;
-
-
-		if (strstr(spec, "PSK"))
-			c->auth_suites |= IWINFO_KMGMT_PSK;
-
-		if (strstr(spec, "802.1X") || strstr(spec, "EAP"))
-			c->auth_suites |= IWINFO_KMGMT_8021x;
-
-		if (strstr(spec, "WPA-NONE"))
-			c->auth_suites |= IWINFO_KMGMT_NONE;
-
-
-		if (strstr(spec, "TKIP"))
-			c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-
-		if (strstr(spec, "CCMP"))
-			c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-
-		if (strstr(spec, "WEP-40"))
-			c->pair_ciphers |= IWINFO_CIPHER_WEP40;
-
-		if (strstr(spec, "WEP-104"))
-			c->pair_ciphers |= IWINFO_CIPHER_WEP104;
-
-		c->group_ciphers = c->pair_ciphers;
-	}
-	else
-	{
-		c->enabled = 0;
-	}
-}
-
-int nl80211_get_scanlist(const char *ifname, char *buf, int *len)
-{
-	int freq, rssi, qmax, count;
-	char *res;
-	char ssid[128] = { 0 };
-	char bssid[18] = { 0 };
-	char cipher[256] = { 0 };
-
-	/* Got a radioX pseudo interface, find some interface on it or create one */
-	if (!strncmp(ifname, "radio", 5))
-	{
-		/* Reuse existing interface */
-		if ((res = nl80211_phy2ifname(ifname)) != NULL)
-		{
-			return nl80211_get_scanlist(res, buf, len);
-		}
-
-		/* Need to spawn a temporary iface for scanning */
-		else if ((res = nl80211_ifadd(ifname)) != NULL)
-		{
-			count = nl80211_get_scanlist(res, buf, len);
-			nl80211_ifdel(res);
-			return count;
-		}
-	}
-
-	struct iwinfo_scanlist_entry *e = (struct iwinfo_scanlist_entry *)buf;
-
-	/* WPA supplicant */
-	if ((res = nl80211_wpactl_info(ifname, "SCAN", "CTRL-EVENT-SCAN-RESULTS")))
-	{
-		if ((res = nl80211_wpactl_info(ifname, "SCAN_RESULTS", NULL)))
-		{
-			nl80211_get_quality_max(ifname, &qmax);
-
-			/* skip header line */
-			while( *res++ != '\n' );
-
-			count = 0;
-
-			while( sscanf(res, "%17s %d %d %255s%*[ \t]%127[^\n]\n",
-			              bssid, &freq, &rssi, cipher, ssid) > 0 )
-			{
-				/* BSSID */
-				e->mac[0] = strtol(&bssid[0],  NULL, 16);
-				e->mac[1] = strtol(&bssid[3],  NULL, 16);
-				e->mac[2] = strtol(&bssid[6],  NULL, 16);
-				e->mac[3] = strtol(&bssid[9],  NULL, 16);
-				e->mac[4] = strtol(&bssid[12], NULL, 16);
-				e->mac[5] = strtol(&bssid[15], NULL, 16);
-
-				/* SSID */
-				memcpy(e->ssid, ssid,
-					min(strlen(ssid), sizeof(e->ssid) - 1));
-
-				/* Mode (assume master) */
-				sprintf((char *)e->mode, "Master");
-
-				/* Channel */
-				e->channel = nl80211_freq2channel(freq);
-
-				/* Signal */
-				e->signal = rssi;
-
-				/* Quality */
-				if (rssi < 0)
-				{
-					/* The cfg80211 wext compat layer assumes a signal range
-					 * of -110 dBm to -40 dBm, the quality value is derived
-					 * by adding 110 to the signal level */
-					if (rssi < -110)
-						rssi = -110;
-					else if (rssi > -40)
-						rssi = -40;
-
-					e->quality = (rssi + 110);
-				}
-				else
-				{
-					e->quality = rssi;
-				}
-
-				/* Max. Quality */
-				e->quality_max = qmax;
-
-				/* Crypto */
-				nl80211_get_scancrypto(cipher, &e->crypto);
-
-				/* advance to next line */
-				while( *res && *res++ != '\n' );
-
-				count++;
-				e++;
-
-				memset(ssid, 0, sizeof(ssid));
-				memset(bssid, 0, sizeof(bssid));
-				memset(cipher, 0, sizeof(cipher));
-			}
-
-			*len = count * sizeof(struct iwinfo_scanlist_entry);
-			return 0;
-		}
-	}
-
-	/* AP scan */
-	else
-	{
-		/* Got a temp interface, don't create yet another one */
-		if (!strncmp(ifname, "tmp.", 4))
-		{
-			if (!iwinfo_ifup(ifname))
-				return -1;
-
-			wext_get_scanlist(ifname, buf, len);
-			iwinfo_ifdown(ifname);
-			return 0;
-		}
-
-		/* Spawn a new scan interface */
-		else
-		{
-			if (!(res = nl80211_ifadd(ifname)))
-				goto out;
-
-			if (!iwinfo_ifmac(res))
-				goto out;
-
-			/* if we can take the new interface up, the driver supports an
-			 * additional interface and there's no need to tear down the ap */
-			if (iwinfo_ifup(res))
-			{
-				wext_get_scanlist(res, buf, len);
-				iwinfo_ifdown(res);
-			}
-
-			/* driver cannot create secondary interface, take down ap
-			 * during scan */
-			else if (iwinfo_ifdown(ifname) && iwinfo_ifup(res))
-			{
-				wext_get_scanlist(res, buf, len);
-				iwinfo_ifdown(res);
-				iwinfo_ifup(ifname);
-				nl80211_hostapd_hup(ifname);
-			}
-
-		out:
-			nl80211_ifdel(res);
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-static int nl80211_get_freqlist_cb(struct nl_msg *msg, void *arg)
-{
-	int bands_remain, freqs_remain;
-
-	struct nl80211_array_buf *arr = arg;
-	struct iwinfo_freqlist_entry *e = arr->buf;
-
-	struct nlattr **attr = nl80211_parse(msg);
-	struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1];
-	struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1];
-	struct nlattr *band, *freq;
-
-	static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
-		[NL80211_FREQUENCY_ATTR_FREQ]         = { .type = NLA_U32  },
-		[NL80211_FREQUENCY_ATTR_DISABLED]     = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_NO_IBSS]      = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_RADAR]        = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32  },
-	};
-
-	nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
-	{
-		nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band),
-			nla_len(band), NULL);
-
-		nla_for_each_nested(freq,
-			bands[NL80211_BAND_ATTR_FREQS], freqs_remain)
-		{
-			nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
-				nla_data(freq), nla_len(freq), NULL);
-
-			if( !freqs[NL80211_FREQUENCY_ATTR_FREQ] ||
-				freqs[NL80211_FREQUENCY_ATTR_DISABLED] )
-				continue;
-
-			e->mhz = nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]);
-			e->channel = nl80211_freq2channel(e->mhz);
-
-			e->restricted = (
-				freqs[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] ||
-				freqs[NL80211_FREQUENCY_ATTR_NO_IBSS]      ||
-				freqs[NL80211_FREQUENCY_ATTR_RADAR]
-			) ? 1 : 0;
-
-			e++;
-			arr->count++;
-		}
-	}
-
-	return NL_SKIP;
-}
-
-int nl80211_get_freqlist(const char *ifname, char *buf, int *len)
-{
-	struct nl80211_msg_conveyor *req;
-	struct nl80211_array_buf arr = { .buf = buf, .count = 0 };
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
-	if (req)
-	{
-		nl80211_send(req, nl80211_get_freqlist_cb, &arr);
-		nl80211_free(req);
-	}
-
-	if (arr.count > 0)
-	{
-		*len = arr.count * sizeof(struct iwinfo_freqlist_entry);
-		return 0;
-	}
-
-	return -1;
-}
-
-static int nl80211_get_country_cb(struct nl_msg *msg, void *arg)
-{
-	char *buf = arg;
-	struct nlattr **attr = nl80211_parse(msg);
-
-	if (attr[NL80211_ATTR_REG_ALPHA2])
-		memcpy(buf, nla_data(attr[NL80211_ATTR_REG_ALPHA2]), 2);
-	else
-		buf[0] = 0;
-
-	return NL_SKIP;
-}
-
-int nl80211_get_country(const char *ifname, char *buf)
-{
-	int rv = -1;
-	struct nl80211_msg_conveyor *req;
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_REG, 0);
-	if (req)
-	{
-		nl80211_send(req, nl80211_get_country_cb, buf);
-		nl80211_free(req);
-
-		if (buf[0])
-			rv = 0;
-	}
-
-	return rv;
-}
-
-int nl80211_get_countrylist(const char *ifname, char *buf, int *len)
-{
-	int i, count;
-	struct iwinfo_country_entry *e = (struct iwinfo_country_entry *)buf;
-	const struct iwinfo_iso3166_label *l;
-
-	for( l = IWINFO_ISO3166_NAMES, count = 0; l->iso3166; l++, e++, count++ )
-	{
-		e->iso3166 = l->iso3166;
-		e->ccode[0] = (l->iso3166 / 256);
-		e->ccode[1] = (l->iso3166 % 256);
-	}
-
-	*len = (count * sizeof(struct iwinfo_country_entry));
-	return 0;
-}
-
-static int nl80211_get_hwmodelist_cb(struct nl_msg *msg, void *arg)
-{
-	int *modes = arg;
-	int bands_remain, freqs_remain;
-	uint16_t caps = 0;
-	struct nlattr **attr = nl80211_parse(msg);
-	struct nlattr *bands[NL80211_BAND_ATTR_MAX + 1];
-	struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1];
-	struct nlattr *band, *freq;
-
-	*modes = 0;
-
-	if (attr[NL80211_ATTR_WIPHY_BANDS])
-	{
-		nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
-		{
-			nla_parse(bands, NL80211_BAND_ATTR_MAX, nla_data(band),
-				nla_len(band), NULL);
-
-			if (bands[NL80211_BAND_ATTR_HT_CAPA])
-				caps = nla_get_u16(bands[NL80211_BAND_ATTR_HT_CAPA]);
-
-			/* Treat any nonzero capability as 11n */
-			if (caps > 0)
-				*modes |= IWINFO_80211_N;
-
-			nla_for_each_nested(freq,
-				bands[NL80211_BAND_ATTR_FREQS], freqs_remain)
-			{
-				nla_parse(freqs, NL80211_FREQUENCY_ATTR_MAX,
-					nla_data(freq), nla_len(freq), NULL);
-
-				if (!freqs[NL80211_FREQUENCY_ATTR_FREQ])
-					continue;
-
-				if (nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]) < 2485)
-				{
-					*modes |= IWINFO_80211_B;
-					*modes |= IWINFO_80211_G;
-				}
-				else
-				{
-					*modes |= IWINFO_80211_A;
-				}
-			}
-		}
-	}
-
-	return NL_SKIP;
-}
-
-int nl80211_get_hwmodelist(const char *ifname, int *buf)
-{
-	struct nl80211_msg_conveyor *req;
-
-	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
-	if (req)
-	{
-		nl80211_send(req, nl80211_get_hwmodelist_cb, buf);
-		nl80211_free(req);
-	}
-
-	return *buf ? 0 : -1;
-}
-
-int nl80211_get_mbssid_support(const char *ifname, int *buf)
-{
-	/* Test whether we can create another interface */
-	char *nif = nl80211_ifadd(ifname);
-
-	if (nif)
-	{
-		*buf = (iwinfo_ifmac(nif) && iwinfo_ifup(nif));
-
-		iwinfo_ifdown(nif);
-		nl80211_ifdel(nif);
-
-		return 0;
-	}
-
-	return -1;
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_utils.c b/contrib/package/iwinfo/src/iwinfo_utils.c
deleted file mode 100644
index 081464aaf..000000000
--- a/contrib/package/iwinfo/src/iwinfo_utils.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Shared utility routines
- *
- *   Copyright (C) 2010 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/utils.h"
-
-
-static int ioctl_socket = -1;
-
-static int iwinfo_ioctl_socket(void)
-{
-	/* Prepare socket */
-	if( ioctl_socket == -1 )
-	{
-		ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
-		fcntl(ioctl_socket, F_SETFD, fcntl(ioctl_socket, F_GETFD) | FD_CLOEXEC);
-	}
-
-	return ioctl_socket;
-}
-
-int iwinfo_ioctl(int cmd, void *ifr)
-{
-	int s = iwinfo_ioctl_socket();
-	return ioctl(s, cmd, ifr);
-}
-
-int iwinfo_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;
-}
-
-int iwinfo_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 (int)res;
-}
-
-int iwinfo_ifup(const char *ifname)
-{
-	struct ifreq ifr;
-
-	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-	if( iwinfo_ioctl(SIOCGIFFLAGS, &ifr) )
-		return 0;
-
-	ifr.ifr_flags |= (IFF_UP | IFF_RUNNING);
-
-	return !iwinfo_ioctl(SIOCSIFFLAGS, &ifr);
-}
-
-int iwinfo_ifdown(const char *ifname)
-{
-	struct ifreq ifr;
-
-	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-	if( iwinfo_ioctl(SIOCGIFFLAGS, &ifr) )
-		return 0;
-
-	ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
-
-	return !iwinfo_ioctl(SIOCSIFFLAGS, &ifr);
-}
-
-int iwinfo_ifmac(const char *ifname)
-{
-	struct ifreq ifr;
-
-	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-	if( iwinfo_ioctl(SIOCGIFHWADDR, &ifr) )
-		return 0;
-
-	ifr.ifr_hwaddr.sa_data[1]++;
-	ifr.ifr_hwaddr.sa_data[2]++;
-
-	return !iwinfo_ioctl(SIOCSIFHWADDR, &ifr);
-}
-
-void iwinfo_close(void)
-{
-	if( ioctl_socket > -1 )
-		close(ioctl_socket);
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_wext.c b/contrib/package/iwinfo/src/iwinfo_wext.c
deleted file mode 100644
index 314882ad9..000000000
--- a/contrib/package/iwinfo/src/iwinfo_wext.c
+++ /dev/null
@@ -1,462 +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"
-
-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 inline int wext_freq2mhz(const struct iw_freq *in)
-{
-	int i;
-
-	if( in->e == 6 )
-	{
-		return in->m;
-	}
-	else
-	{
-		return (int)(wext_freq2float(in) / 1000000);
-	}
-}
-
-static inline int wext_ioctl(const char *ifname, int cmd, struct iwreq *wrq)
-{
-	if( !strncmp(ifname, "mon.", 4) )
-		strncpy(wrq->ifr_name, &ifname[4], IFNAMSIZ);
-	else
-		strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
-
-	return iwinfo_ioctl(cmd, wrq);
-}
-
-
-int wext_probe(const char *ifname)
-{
-	struct iwreq wrq;
-
-	if(wext_ioctl(ifname, SIOCGIWNAME, &wrq) >= 0)
-		return 1;
-
-	return 0;
-}
-
-void wext_close(void)
-{
-	/* Nop */
-}
-
-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_txpower(const char *ifname, int *buf)
-{
-	struct iwreq wrq;
-
-	wrq.u.txpower.flags = 0;
-
-	if(wext_ioctl(ifname, SIOCGIWTXPOW, &wrq) >= 0)
-	{
-		if(wrq.u.txpower.flags & IW_TXPOW_MWATT)
-			*buf = iwinfo_mw2dbm(wrq.u.txpower.value);
-		else
-			*buf = wrq.u.txpower.value;
-
-		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.updated & IW_QUAL_DBM)
-			? (stats.qual.level - 0x100) : stats.qual.level;
-
-		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.updated & IW_QUAL_DBM)
-			? (stats.qual.noise - 0x100) : stats.qual.noise;
-
-		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_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_MWATT )
-			{
-				entry.dbm = iwinfo_mw2dbm(range.txpower[i]);
-				entry.mw  = range.txpower[i];
-			}
-
-			/* Madwifi does neither set mW not dBm caps, also iwlist assumes
-			 * dBm if mW is not set, so don't check here... */
-			else /* if( range.txpower_capa & IW_TXPOW_DBM ) */
-			{
-				entry.dbm = range.txpower[i];
-				entry.mw  = iwinfo_dbm2mw(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;
-			entry.restricted = 0;
-
-			memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
-			bl += sizeof(struct iwinfo_freqlist_entry);
-		}
-
-		*len = bl;
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_country(const char *ifname, char *buf)
-{
-	sprintf(buf, "00");
-	return 0;
-}
-
-int wext_get_countrylist(const char *ifname, char *buf, int *len)
-{
-	/* Stub */
-	return -1;
-}
-
-int wext_get_hwmodelist(const char *ifname, int *buf)
-{
-	char chans[IWINFO_BUFSIZE] = { 0 };
-	struct iwinfo_freqlist_entry *e = NULL;
-	int len = 0;
-
-	if( !wext_get_freqlist(ifname, chans, &len) )
-	{
-		for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )
-		{
-			if( e->channel <= 14 )
-			{
-				*buf |= IWINFO_80211_B;
-				*buf |= IWINFO_80211_G;
-			}
-			else
-			{
-				*buf |= IWINFO_80211_A;
-			}
-		}
-
-		return 0;
-	}
-
-	return -1;
-}
-
-int wext_get_encryption(const char *ifname, char *buf)
-{
-	/* No reliable crypto info in wext */
-	return -1;
-}
-
-int wext_get_mbssid_support(const char *ifname, int *buf)
-{
-	/* No multi bssid support atm */
-	return -1;
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_wext_scan.c b/contrib/package/iwinfo/src/iwinfo_wext_scan.c
deleted file mode 100644
index 11725c938..000000000
--- a/contrib/package/iwinfo/src/iwinfo_wext_scan.c
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * iwinfo - Wireless Information Library - Linux Wireless Extension Backend
- *
- *   Copyright (C) 2009-2010 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 wext_ioctl(const char *ifname, int cmd, struct iwreq *wrq)
-{
-	strncpy(wrq->ifr_name, ifname, IFNAMSIZ);
-	return iwinfo_ioctl(cmd, wrq);
-}
-
-static inline 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 inline 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;
-			}
-
-			*len = 0;
-			free(buffer);
-			return 0;
-		}
-	}
-
-	return -1;
-}
diff --git a/contrib/package/iwinfo/src/iwinfo_wl.c b/contrib/package/iwinfo/src/iwinfo_wl.c
deleted file mode 100644
index b3227918d..000000000
--- a/contrib/package/iwinfo/src/iwinfo_wl.c
+++ /dev/null
@@ -1,558 +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 wl_ioctl(const char *name, int cmd, void *buf, int len)
-{
-	struct ifreq ifr;
-	wl_ioctl_t ioc;
-
-	/* do it */
-	ioc.cmd = cmd;
-	ioc.buf = buf;
-	ioc.len = len;
-
-	strncpy(ifr.ifr_name, name, IFNAMSIZ);
-	ifr.ifr_data = (caddr_t) &ioc;
-
-	return iwinfo_ioctl(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;
-}
-
-void wl_close(void)
-{
-	/* Nop */
-}
-
-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_txpower(const char *ifname, int *buf)
-{
-	return wext_get_txpower(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_encryption(const char *ifname, char *buf)
-{
-	uint32_t wsec, wauth, wpa;
-	struct iwinfo_crypto_entry *c = (struct iwinfo_crypto_entry *)buf;
-
-	if( wl_ioctl(ifname, WLC_GET_WPA_AUTH, &wpa,   sizeof(uint32_t)) ||
-	    wl_ioctl(ifname, WLC_GET_WSEC,     &wsec,  sizeof(uint32_t)) ||
-		wl_ioctl(ifname, WLC_GET_AUTH,     &wauth, sizeof(uint32_t)) )
-			return -1;
-
-	switch(wsec)
-	{
-		case 2:
-			c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-			break;
-
-		case 4:
-			c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-			break;
-
-		case 6:
-			c->pair_ciphers |= IWINFO_CIPHER_TKIP;
-			c->pair_ciphers |= IWINFO_CIPHER_CCMP;
-			break;
-	}
-
-	switch(wpa)
-	{
-		case 0:
-			if( wsec && !wauth )
-				c->auth_algs |= IWINFO_AUTH_OPEN;
-
-			else if( wsec && wauth )
-				c->auth_algs |= IWINFO_AUTH_SHARED;
-
-			/* ToDo: evaluate WEP key lengths */
-			c->pair_ciphers = IWINFO_CIPHER_WEP40 | IWINFO_CIPHER_WEP104;
-			c->auth_suites |= IWINFO_KMGMT_NONE;
-			break;
-
-		case 2:
-			c->wpa_version = 1;
-			c->auth_suites |= IWINFO_KMGMT_8021x;
-			break;
-
-		case 4:
-			c->wpa_version = 1;
-			c->auth_suites |= IWINFO_KMGMT_PSK;
-			break;
-
-		case 32:
-		case 64:
-			c->wpa_version = 2;
-			c->auth_suites |= IWINFO_KMGMT_8021x;
-			break;
-
-		case 66:
-			c->wpa_version = 3;
-			c->auth_suites |= IWINFO_KMGMT_8021x;
-			break;
-
-		case 128:
-			c->wpa_version = 2;
-			c->auth_suites |= IWINFO_KMGMT_PSK;
-			break;
-
-		case 132:
-			c->wpa_version = 3;
-			c->auth_suites |= IWINFO_KMGMT_PSK;
-			break;
-
-		default:
-			break;
-	}
-
-	c->enabled = (c->wpa_version || c->auth_algs) ? 1 : 0;
-	c->group_ciphers = c->pair_ciphers;
-
-	return 0;
-}
-
-int wl_get_enctype(const char *ifname, char *buf)
-{
-	uint32_t wsec, wpa;
-	char algo[11];
-
-	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, "Unknown");
-	}
-
-	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_country(const char *ifname, char *buf)
-{
-	char ccode[WLC_CNTRY_BUF_SZ];
-
-	if( !wl_ioctl(ifname, WLC_GET_COUNTRY, ccode, WLC_CNTRY_BUF_SZ) )
-	{
-		/* IL0 -> World */
-		if( !strcmp(ccode, "IL0") )
-			sprintf(buf, "00");
-
-		/* YU -> RS */
-		else if( !strcmp(ccode, "YU") )
-			sprintf(buf, "RS");
-
-		else
-			memcpy(buf, ccode, 2);
-
-		return 0;
-	}
-
-	return -1;
-}
-
-int wl_get_countrylist(const char *ifname, char *buf, int *len)
-{
-	int i, count;
-	char cdata[WLC_IOCTL_MAXLEN];
-	struct iwinfo_country_entry *c = (struct iwinfo_country_entry *)buf;
-	wl_country_list_t *cl = (wl_country_list_t *)cdata;
-
-	cl->buflen = sizeof(cdata);
-
-	if( !wl_ioctl(ifname, WLC_GET_COUNTRY_LIST, cl, cl->buflen) )
-	{
-		for( i = 0, count = 0; i < cl->count; i++, c++ )
-		{
-			sprintf(c->ccode, &cl->country_abbrev[i * WLC_CNTRY_BUF_SZ]);
-			c->iso3166 = c->ccode[0] * 256 + c->ccode[1];
-
-			/* IL0 -> World */
-			if( !strcmp(c->ccode, "IL0") )
-				c->iso3166 = 0x3030;
-
-			/* YU -> RS */
-			else if( !strcmp(c->ccode, "YU") )
-				c->iso3166 = 0x5253;
-		}
-
-		*len = (i * sizeof(struct iwinfo_country_entry));
-		return 0;
-	}
-
-	return -1;
-}
-
-int wl_get_hwmodelist(const char *ifname, int *buf)
-{
-	return wext_get_hwmodelist(ifname, buf);
-}
-
-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;
-}