[pkg-wpa-devel] r919 - in /wpasupplicant/trunk: ./ debian/ debian/madwifi/ debian/patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Tue Dec 25 14:56:52 UTC 2007
Author: kelmo-guest
Date: Tue Dec 25 14:56:52 2007
New Revision: 919
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=919
Log:
* Adjust Standards-Version to 3.7.3, no extra changes required.
* Switch to quilt patch management from dpatch:
- build-depend on quilt, adjust debian/rules accordingly
- debian/madwifi/mk-madwifi-header-patch becomes obsolete, removed
* Remove debian/defconfig.sh, and re-impliment it in patch form again, but
this time with a patch management system that can be used more naturally.
This also allows an oppurtunity to go over our default build
configuration.
* Add svn:ignore property for .pc quilt by-product.
* Ensure src/drivers/driver_madwifi/ directory is purged from source tree in
clean target of debian/rules.
Added:
wpasupplicant/trunk/debian/patches/01_defconfig.patch
wpasupplicant/trunk/debian/patches/10_dbus_group_policy.patch
wpasupplicant/trunk/debian/patches/20_madwifi_headers.patch
wpasupplicant/trunk/debian/patches/21_config_driver_madwifi.patch
wpasupplicant/trunk/debian/patches/series
Removed:
wpasupplicant/trunk/debian/defconfig.sh
wpasupplicant/trunk/debian/madwifi/
wpasupplicant/trunk/debian/patches/00list
wpasupplicant/trunk/debian/patches/10_dbus_policy.dpatch
wpasupplicant/trunk/debian/patches/20_madwifi_headers
Modified:
wpasupplicant/trunk/ (props changed)
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/rules
Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 25 14:56:52 2007
@@ -1,0 +1,1 @@
+.pc
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=919&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Dec 25 14:56:52 2007
@@ -8,10 +8,19 @@
wpa keys. Valid wep keys can be hex of length 10|26|32|58 or ascii with
length of at least 5.
* Check wpa_cli return value in wpa_cli() function of functions.sh.
- * Enable CONFIG_DEBUG_FILE in the debian default build configuration, to
- allow debug output to file.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 09 Dec 2007 18:42:49 +1000
+ * Adjust Standards-Version to 3.7.3, no extra changes required.
+ * Switch to quilt patch management from dpatch:
+ - build-depend on quilt, adjust debian/rules accordingly
+ - debian/madwifi/mk-madwifi-header-patch becomes obsolete, removed
+ * Remove debian/defconfig.sh, and re-impliment it in patch form again, but
+ this time with a patch management system that can be used more naturally.
+ This also allows an oppurtunity to go over our default build
+ configuration.
+ * Add svn:ignore property for .pc quilt by-product.
+ * Ensure src/drivers/driver_madwifi/ directory is purged from source tree in
+ clean target of debian/rules.
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 26 Dec 2007 00:55:04 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=919&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Tue Dec 25 14:56:52 2007
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
Uploaders: Kyle McMartin <kyle at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), quilt, libssl-dev, libreadline5-dev, libqt4-dev, libdbus-1-dev, docbook, docbook-utils
Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
Homepage: http://w1.fi/wpa_supplicant/
Added: wpasupplicant/trunk/debian/patches/01_defconfig.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_defconfig.patch?rev=919&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_defconfig.patch (added)
+++ wpasupplicant/trunk/debian/patches/01_defconfig.patch Tue Dec 25 14:56:52 2007
@@ -1,0 +1,325 @@
+--- /dev/null
++++ b/wpa_supplicant/.config
+@@ -0,0 +1,322 @@
++# Debian's wpa_supplicant build time configuration
++
++# Driver interface for Host AP driver
++CONFIG_DRIVER_HOSTAP=y
++
++# Driver interface for Agere driver
++#CONFIG_DRIVER_HERMES=y
++# Change include directories to match with the local setup
++#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
++#CFLAGS += -I../../include/wireless
++
++# Driver interface for madwifi driver
++#CONFIG_DRIVER_MADWIFI=y
++# Change include directories to match with the local setup
++#CFLAGS += -I../madwifi/wpa
++
++# Driver interface for Prism54 driver
++# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
++# for developers only)
++#CONFIG_DRIVER_PRISM54=y
++
++# Driver interface for ndiswrapper
++#CONFIG_DRIVER_NDISWRAPPER=y
++
++# Driver interface for Atmel driver
++CONFIG_DRIVER_ATMEL=y
++
++# Driver interface for Broadcom driver
++#CONFIG_DRIVER_BROADCOM=y
++# Example path for wlioctl.h; change to match your configuration
++#CFLAGS += -I/opt/WRT54GS/release/src/include
++# Non-GPL header required
++
++# Driver interface for Intel ipw2100/2200 driver
++#CONFIG_DRIVER_IPW=y
++# Deprecated since Linux 2.6.14
++
++# Driver interface for Ralink driver
++#CONFIG_DRIVER_RALINK=y
++# rt2x00 supports DRIVER_WEXT
++
++# Driver interface for generic Linux wireless extensions
++CONFIG_DRIVER_WEXT=y
++
++# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
++#CONFIG_DRIVER_BSD=y
++#CFLAGS += -I/usr/local/include
++#LIBS += -L/usr/local/lib
++
++# Driver interface for Windows NDIS
++#CONFIG_DRIVER_NDIS=y
++#CFLAGS += -I/usr/include/w32api/ddk
++#LIBS += -L/usr/local/lib
++# For native build using mingw
++#CONFIG_NATIVE_WINDOWS=y
++# Additional directories for cross-compilation on Linux host for mingw target
++#CFLAGS += -I/opt/mingw/mingw32/include/ddk
++#LIBS += -L/opt/mingw/mingw32/lib
++#CC=mingw32-gcc
++# By default, driver_ndis uses WinPcap for low-level operations. This can be
++# replaced with the following option which replaces WinPcap calls with NDISUIO.
++# However, this requires that WZC is disabled (net stop wzcsvc) before starting
++# wpa_supplicant.
++# CONFIG_USE_NDISUIO=y
++
++# Driver interface for development testing
++CONFIG_DRIVER_TEST=y
++
++# Driver interface for wired Ethernet drivers
++CONFIG_DRIVER_WIRED=y
++
++# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
++# included)
++CONFIG_IEEE8021X_EAPOL=y
++
++# EAP-MD5
++CONFIG_EAP_MD5=y
++
++# EAP-MSCHAPv2
++CONFIG_EAP_MSCHAPV2=y
++
++# EAP-TLS
++CONFIG_EAP_TLS=y
++
++# EAL-PEAP
++CONFIG_EAP_PEAP=y
++
++# EAP-TTLS
++CONFIG_EAP_TTLS=y
++
++# EAP-FAST
++# Note: Default OpenSSL package does not include support for all the
++# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
++# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
++# to add the needed functions.
++#CONFIG_EAP_FAST=y
++
++# EAP-GTC
++CONFIG_EAP_GTC=y
++
++# EAP-OTP
++CONFIG_EAP_OTP=y
++
++# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
++#CONFIG_EAP_SIM=y
++
++# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
++CONFIG_EAP_PSK=y
++
++# EAP-PAX
++CONFIG_EAP_PAX=y
++
++# LEAP
++CONFIG_EAP_LEAP=y
++
++# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
++#CONFIG_EAP_AKA=y
++
++# EAP-SAKE
++#CONFIG_EAP_SAKE=y
++
++# EAP-GPSK
++#CONFIG_EAP_GPSK=y
++# Include support for optional SHA256 cipher suite in EAP-GPSK
++#CONFIG_EAP_GPSK_SHA256=y
++
++# EAP-TNC and related Trusted Network Connect support (experimental)
++#CONFIG_EAP_TNC=y
++
++# EAP-WSC for Wi-Fi Protected Setup
++#CONFIG_EAP_WSC=y
++
++# PKCS#12 (PFX) support (used to read private key and certificate file from
++# a file that usually has extension .p12 or .pfx)
++CONFIG_PKCS12=y
++
++# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
++# engine.
++CONFIG_SMARTCARD=y
++
++# PC/SC interface for smartcards (USIM, GSM SIM)
++# Enable this if EAP-SIM or EAP-AKA is included
++#CONFIG_PCSC=y
++
++# Development testing
++#CONFIG_EAPOL_TEST=y
++
++# Select control interface backend for external programs, e.g, wpa_cli:
++# unix = UNIX domain sockets (default for Linux/*BSD)
++# udp = UDP sockets using localhost (127.0.0.1)
++# named_pipe = Windows Named Pipe (default for Windows)
++# y = use default (backwards compatibility)
++# If this option is commented out, control interface is not included in the
++# build.
++CONFIG_CTRL_IFACE=y
++
++# Include support for GNU Readline and History Libraries in wpa_cli.
++# When building a wpa_cli binary for distribution, please note that these
++# libraries are licensed under GPL and as such, BSD license may not apply for
++# the resulting binary.
++CONFIG_READLINE=y
++
++# Remove debugging code that is printing out debug message to stdout.
++# This can be used to reduce the size of the wpa_supplicant considerably
++# if debugging code is not needed. The size reduction can be around 35%
++# (e.g., 90 kB).
++#CONFIG_NO_STDOUT_DEBUG=y
++
++# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
++# 35-50 kB in code size.
++#CONFIG_NO_WPA=y
++
++# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
++# save about 1 kB in code size when building only WPA-Personal (no EAP support)
++# or 6 kB if building for WPA-Enterprise.
++#CONFIG_NO_WPA2=y
++
++# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
++# This option can be used to reduce code size by removing support for
++# converting ASCII passphrases into PSK. If this functionality is removed, the
++# PSK can only be configured as the 64-octet hexstring (e.g., from
++# wpa_passphrase). This saves about 0.5 kB in code size.
++#CONFIG_NO_WPA_PASSPHRASE=y
++
++# Remove AES extra functions. This can be used to reduce code size by about
++# 1.5 kB by removing extra AES modes that are not needed for commonly used
++# client configurations (they are needed for some EAP types).
++#CONFIG_NO_AES_EXTRAS=y
++
++# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
++# This can be used if ap_scan=1 mode is never enabled.
++#CONFIG_NO_SCAN_PROCESSING=y
++
++# Select configuration backend:
++# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
++# path is given on command line, not here; this option is just used to
++# select the backend that allows configuration files to be used)
++# winreg = Windows registry (see win_example.reg for an example)
++CONFIG_BACKEND=file
++
++# Remove configuration write functionality (i.e., to allow the configuration
++# file to be updated based on runtime configuration changes). The runtime
++# configuration can still be changed, the changes are just not going to be
++# persistent over restarts. This option can be used to reduce code size by
++# about 3.5 kB.
++#CONFIG_NO_CONFIG_WRITE=y
++
++# Remove support for configuration blobs to reduce code size by about 1.5 kB.
++#CONFIG_NO_CONFIG_BLOBS=y
++
++# Select program entry point implementation:
++# main = UNIX/POSIX like main() function (default)
++# main_winsvc = Windows service (read parameters from registry)
++# main_none = Very basic example (development use only)
++CONFIG_MAIN=main
++
++# Select wrapper for operatins system and C library specific functions
++# unix = UNIX/POSIX like systems (default)
++# win32 = Windows systems
++# none = Empty template
++CONFIG_OS=unix
++
++# Select event loop implementation
++# eloop = select() loop (default)
++# eloop_win = Windows events and WaitForMultipleObject() loop
++# eloop_none = Empty template
++CONFIG_ELOOP=eloop
++
++# Select layer 2 packet implementation
++# linux = Linux packet socket (default)
++# pcap = libpcap/libdnet/WinPcap
++# freebsd = FreeBSD libpcap
++# winpcap = WinPcap with receive thread
++# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
++# none = Empty template
++CONFIG_L2_PACKET=linux
++
++# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
++CONFIG_PEERKEY=y
++
++# IEEE 802.11w (management frame protection)
++# This version is an experimental implementation based on IEEE 802.11w/D1.0
++# draft and is subject to change since the standard has not yet been finalized.
++# Driver support is also needed for IEEE 802.11w.
++#CONFIG_IEEE80211W=y
++
++# Select TLS implementation
++# openssl = OpenSSL (default)
++# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
++# internal = Internal TLSv1 implementation (experimental)
++# none = Empty template
++CONFIG_TLS=openssl
++
++# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
++# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
++# even though the core GnuTLS library is released under LGPL, this extra
++# library uses GPL and as such, the terms of GPL apply to the combination
++# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
++# apply for distribution of the resulting binary.
++#CONFIG_GNUTLS_EXTRA=y
++
++# If CONFIG_TLS=internal is used, additional library and include paths are
++# needed for LibTomMath. Alternatively, an integrated, minimal version of
++# LibTomMath can be used. See beginning of libtommath.c for details on benefits
++# and drawbacks of this option.
++#CONFIG_INTERNAL_LIBTOMMATH=y
++#ifndef CONFIG_INTERNAL_LIBTOMMATH
++#LTM_PATH=/usr/src/libtommath-0.39
++#CFLAGS += -I$(LTM_PATH)
++#LIBS += -L$(LTM_PATH)
++#LIBS_p += -L$(LTM_PATH)
++#endif
++
++# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
++# This is only for Windows builds and requires WMI-related header files and
++# WbemUuid.Lib from Platform SDK even when building with MinGW.
++#CONFIG_NDIS_EVENTS_INTEGRATED=y
++#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
++
++# Add support for DBus control interface
++CONFIG_CTRL_IFACE_DBUS=y
++
++# Add support for loading EAP methods dynamically as shared libraries.
++# When this option is enabled, each EAP method can be either included
++# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
++# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
++# be loaded in the beginning of the wpa_supplicant configuration file
++# (see load_dynamic_eap parameter in the example file) before being used in
++# the network blocks.
++#
++# Note that some shared parts of EAP methods are included in the main program
++# and in order to be able to use dynamic EAP methods using these parts, the
++# main program must have been build with the EAP method enabled (=y or =dyn).
++# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
++# unless at least one of them was included in the main build to force inclusion
++# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
++# in the main build to be able to load these methods dynamically.
++#
++# Please also note that using dynamic libraries will increase the total binary
++# size. Thus, it may not be the best option for targets that have limited
++# amount of memory/flash.
++#CONFIG_DYNAMIC_EAP_METHODS=y
++
++# Include client MLME (management frame processing).
++# This can be used to move MLME processing of Devicescape IEEE 802.11 stack
++# into user space.
++#CONFIG_CLIENT_MLME=y
++# Currently, driver_devicescape.c build requires some additional parameters
++# to be able to include some of the kernel header files. Following lines can
++# be used to set these (WIRELESS_DEV must point to the root directory of the
++# wireless-dev.git tree).
++#WIRELESS_DEV=/usr/src/wireless-dev
++#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
++
++# IEEE 802.11r/D4.1 (Fast BSS Transition)
++# This enables an experimental implementation of a draft version of
++# IEEE 802.11r. This draft is still subject to change, so it should be noted
++# that this version may not comply with the final standard.
++#CONFIG_IEEE80211R=y
++
++# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
++CONFIG_DEBUG_FILE=y
Added: wpasupplicant/trunk/debian/patches/10_dbus_group_policy.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/10_dbus_group_policy.patch?rev=919&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_dbus_group_policy.patch (added)
+++ wpasupplicant/trunk/debian/patches/10_dbus_group_policy.patch Tue Dec 25 14:56:52 2007
@@ -1,0 +1,13 @@
+--- a/wpa_supplicant/dbus-wpa_supplicant.conf
++++ b/wpa_supplicant/dbus-wpa_supplicant.conf
+@@ -12,6 +12,10 @@
+ <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
+ <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
+ </policy>
++ <policy group="netdev">
++ <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
++ <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
++ </policy>
+ <policy context="default">
+ <deny own="fi.epitest.hostap.WPASupplicant"/>
+ <deny send_destination="fi.epitest.hostap.WPASupplicant"/>
Added: wpasupplicant/trunk/debian/patches/20_madwifi_headers.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/20_madwifi_headers.patch?rev=919&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/20_madwifi_headers.patch (added)
+++ wpasupplicant/trunk/debian/patches/20_madwifi_headers.patch Tue Dec 25 14:56:52 2007
@@ -1,0 +1,2239 @@
+--- /dev/null
++++ b/src/drivers/driver_madwifi/include/compat.h
+@@ -0,0 +1,170 @@
++/*-
++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer,
++ * without modification.
++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
++ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
++ * redistribution must be conditioned upon including a substantially
++ * similar Disclaimer requirement for further binary redistribution.
++ * 3. Neither the names of the above-listed copyright holders nor the names
++ * of any contributors may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * NO WARRANTY
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
++ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
++ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
++ *
++ * $Id: compat.h 2394 2007-05-30 01:41:18Z mtaylor $
++ */
++#ifndef _ATH_COMPAT_H_
++#define _ATH_COMPAT_H_
++
++/* Compatibility with older Linux kernels */
++#ifdef __KERNEL__
++#include <linux/types.h>
++#endif
++#if !defined(__KERNEL__) || !defined (__bitwise)
++#define __le16 u_int16_t
++#define __le32 u_int32_t
++#define __le64 u_int64_t
++#define __be16 u_int16_t
++#define __be32 u_int32_t
++#define __be64 u_int64_t
++#define __force
++#endif
++
++#ifndef container_of
++#define container_of(ptr, type, member) ({ \
++ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
++ (type *)( (char *)__mptr - offsetof(type,member) );})
++#endif
++
++/*
++ * BSD/Linux compatibility shims. These are used mainly to
++ * minimize differences when importing necesary BSD code.
++ */
++#define NBBY 8 /* number of bits/byte */
++
++/* roundup() appears in Linux 2.6.18 */
++#include <linux/kernel.h>
++#ifndef roundup
++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */
++#endif
++
++#define howmany(x, y) (((x)+((y)-1))/(y))
++
++/* Bit map related macros. */
++#define setbit(a,i) ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
++#define clrbit(a,i) ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
++#define isset(a,i) ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
++#define isclr(a,i) (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
++
++#ifndef __packed
++#define __packed __attribute__((__packed__))
++#endif
++
++#define __printflike(_a,_b) \
++ __attribute__ ((__format__ (__printf__, _a, _b)))
++#define __offsetof(t,m) offsetof(t,m)
++
++#ifndef ALIGNED_POINTER
++/*
++ * ALIGNED_POINTER is a boolean macro that checks whether an address
++ * is valid to fetch data elements of type t from on this architecture.
++ * This does not reflect the optimal alignment, just the possibility
++ * (within reasonable limits).
++ *
++ */
++#define ALIGNED_POINTER(p,t) 1
++#endif
++
++#ifdef __KERNEL__
++#define KASSERT(exp, msg) do { \
++ if (unlikely(!(exp))) { \
++ printk msg; \
++ BUG(); \
++ } \
++} while (0)
++#endif /* __KERNEL__ */
++
++/*
++ * NetBSD/FreeBSD defines for file version.
++ */
++#define __FBSDID(_s)
++#define __KERNEL_RCSID(_n,_s)
++
++/*
++ * Fixes for Linux API changes
++ */
++#ifdef __KERNEL__
++
++#include <linux/version.h>
++#include <linux/sysctl.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) && \
++ (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) || defined(CTL_ANY))
++#define ATH_REGISTER_SYSCTL_TABLE(t) register_sysctl_table(t, 1)
++#else
++#define ATH_REGISTER_SYSCTL_TABLE(t) register_sysctl_table(t)
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
++#define __user
++#define __kernel
++#define __iomem
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
++#include <linux/skbuff.h>
++static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
++{
++ return skb->end;
++}
++
++static inline unsigned char *skb_tail_pointer(const struct sk_buff *skb)
++{
++ return skb->tail;
++}
++
++static inline void skb_set_network_header(struct sk_buff *skb, const int offset)
++{
++ skb->nh.raw = skb->data + offset;
++}
++
++static inline void skb_reset_network_header(struct sk_buff *skb)
++{
++ skb->nh.raw = skb->data;
++}
++
++static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
++{
++ return skb->mac.raw;
++}
++
++static inline void skb_reset_mac_header(struct sk_buff *skb)
++{
++ skb->mac.raw = skb->data;
++}
++#endif
++
++#endif /* __KERNEL__ */
++
++#endif /* _ATH_COMPAT_H_ */
+--- /dev/null
++++ b/src/drivers/driver_madwifi/net80211/_ieee80211.h
+@@ -0,0 +1,243 @@
++/*-
++ * Copyright (c) 2001 Atsushi Onoe
++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ * derived from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * 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.
++ *
++ * $Id: _ieee80211.h 1441 2006-02-06 16:03:21Z mrenzmann $
++ */
++#ifndef _NET80211__IEEE80211_H_
++#define _NET80211__IEEE80211_H_
++
++enum ieee80211_phytype {
++ IEEE80211_T_DS, /* direct sequence spread spectrum */
++ IEEE80211_T_FH, /* frequency hopping */
++ IEEE80211_T_OFDM, /* frequency division multiplexing */
++ IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */
++};
++#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
++
++/* XXX not really a mode; there are really multiple PHY's */
++enum ieee80211_phymode {
++ IEEE80211_MODE_AUTO = 0, /* autoselect */
++ IEEE80211_MODE_11A = 1, /* 5GHz, OFDM */
++ IEEE80211_MODE_11B = 2, /* 2GHz, CCK */
++ IEEE80211_MODE_11G = 3, /* 2GHz, OFDM */
++ IEEE80211_MODE_FH = 4, /* 2GHz, GFSK */
++ IEEE80211_MODE_TURBO_A = 5, /* 5GHz, OFDM, 2x clock dynamic turbo */
++ IEEE80211_MODE_TURBO_G = 6, /* 2GHz, OFDM, 2x clock dynamic turbo*/
++};
++#define IEEE80211_MODE_MAX (IEEE80211_MODE_TURBO_G+1)
++
++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 */
++};
++
++/*
++ * 802.11g protection mode.
++ */
++enum ieee80211_protmode {
++ IEEE80211_PROT_NONE = 0, /* no protection */
++ IEEE80211_PROT_CTSONLY = 1, /* CTS to self */
++ IEEE80211_PROT_RTSCTS = 2, /* RTS-CTS */
++};
++
++/*
++ * 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 */
++};
++
++/*
++ * Roaming mode is effectively who controls the operation
++ * of the 802.11 state machine when operating as a station.
++ * State transitions are controlled either by the driver
++ * (typically when management frames are processed by the
++ * hardware/firmware), the host (auto/normal operation of
++ * the 802.11 layer), or explicitly through ioctl requests
++ * when applications like wpa_supplicant want control.
++ */
++enum ieee80211_roamingmode {
++ IEEE80211_ROAMING_DEVICE= 0, /* driver/hardware control */
++ IEEE80211_ROAMING_AUTO = 1, /* 802.11 layer control */
++ IEEE80211_ROAMING_MANUAL= 2, /* application control */
++};
++
++/*
++ * Scanning mode controls station scanning work; this is
++ * used only when roaming mode permits the host to select
++ * the bss to join/channel to use.
++ */
++enum ieee80211_scanmode {
++ IEEE80211_SCAN_DEVICE = 0, /* driver/hardware control */
++ IEEE80211_SCAN_BEST = 1, /* 802.11 layer selects best */
++ IEEE80211_SCAN_FIRST = 2, /* take first suitable candidate */
++};
++
++/*
++ * Channels are specified by frequency and attributes.
++ */
++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 */
++};
++
++#define IEEE80211_CHAN_MAX 255
++#define IEEE80211_CHAN_BYTES 32 /* howmany(IEEE80211_CHAN_MAX, NBBY) */
++#define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */
++#define IEEE80211_CHAN_ANYC ((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
++
++#define IEEE80211_RADAR_11HCOUNT 1
++#define IEEE80211_RADAR_TEST_MUTE_CHAN 36 /* Move to channel 36 for mute test */
++
++/* bits 0-3 are for private use by drivers */
++/* channel attributes */
++#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */
++#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */
++#define IEEE80211_CHAN_OFDM 0x0040 /* OFDM channel */
++#define IEEE80211_CHAN_2GHZ 0x0080 /* 2 GHz spectrum channel. */
++#define IEEE80211_CHAN_5GHZ 0x0100 /* 5 GHz spectrum channel */
++#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */
++#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */
++#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */
++#define IEEE80211_CHAN_RADAR 0x1000 /* Radar found on channel */
++#define IEEE80211_CHAN_STURBO 0x2000 /* 11a static turbo channel only */
++#define IEEE80211_CHAN_HALF 0x4000 /* Half rate channel */
++#define IEEE80211_CHAN_QUARTER 0x8000 /* Quarter rate channel */
++
++/*
++ * Useful combinations of channel characteristics.
++ */
++#define IEEE80211_CHAN_FHSS \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
++#define IEEE80211_CHAN_A \
++ (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)
++#define IEEE80211_CHAN_B \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
++#define IEEE80211_CHAN_PUREG \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM)
++#define IEEE80211_CHAN_G \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
++#define IEEE80211_CHAN_108A \
++ (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
++#define IEEE80211_CHAN_108G \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
++#define IEEE80211_CHAN_ST \
++ (IEEE80211_CHAN_108A | IEEE80211_CHAN_STURBO)
++
++#define IEEE80211_CHAN_ALL \
++ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_GFSK | \
++ IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN)
++#define IEEE80211_CHAN_ALLTURBO \
++ (IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)
++
++#define IEEE80211_IS_CHAN_FHSS(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
++#define IEEE80211_IS_CHAN_A(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
++#define IEEE80211_IS_CHAN_B(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
++#define IEEE80211_IS_CHAN_PUREG(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
++#define IEEE80211_IS_CHAN_G(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
++#define IEEE80211_IS_CHAN_ANYG(_c) \
++ (IEEE80211_IS_CHAN_PUREG(_c) || IEEE80211_IS_CHAN_G(_c))
++#define IEEE80211_IS_CHAN_ST(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST)
++#define IEEE80211_IS_CHAN_108A(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A)
++#define IEEE80211_IS_CHAN_108G(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G)
++
++#define IEEE80211_IS_CHAN_2GHZ(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0)
++#define IEEE80211_IS_CHAN_5GHZ(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0)
++#define IEEE80211_IS_CHAN_OFDM(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0)
++#define IEEE80211_IS_CHAN_CCK(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_CCK) != 0)
++#define IEEE80211_IS_CHAN_GFSK(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_GFSK) != 0)
++#define IEEE80211_IS_CHAN_TURBO(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_TURBO) != 0)
++#define IEEE80211_IS_CHAN_STURBO(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_STURBO) != 0)
++#define IEEE80211_IS_CHAN_DTURBO(_c) \
++ (((_c)->ic_flags & \
++ (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)) == IEEE80211_CHAN_TURBO)
++#define IEEE80211_IS_CHAN_HALF(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_HALF) != 0)
++#define IEEE80211_IS_CHAN_QUARTER(_c) \
++ (((_c)->ic_flags & IEEE80211_CHAN_QUARTER) != 0)
++
++/* ni_chan encoding for FH phy */
++#define IEEE80211_FH_CHANMOD 80
++#define IEEE80211_FH_CHAN(set,pat) (((set) - 1) * IEEE80211_FH_CHANMOD + (pat))
++#define IEEE80211_FH_CHANSET(chan) ((chan) / IEEE80211_FH_CHANMOD + 1)
++#define IEEE80211_FH_CHANPAT(chan) ((chan) % IEEE80211_FH_CHANMOD)
++
++/*
++ * 802.11 rate set.
++ */
++#define IEEE80211_RATE_SIZE 8 /* 802.11 standard */
++#define IEEE80211_RATE_MAXSIZE 15 /* max rates we'll handle */
++
++struct ieee80211_rateset {
++ u_int8_t rs_nrates;
++ u_int8_t rs_rates[IEEE80211_RATE_MAXSIZE];
++};
++
++struct ieee80211_roam {
++ int8_t rssi11a; /* rssi thresh for 11a bss */
++ int8_t rssi11b; /* for 11g sta in 11b bss */
++ int8_t rssi11bOnly; /* for 11b sta */
++ u_int8_t pad1;
++ u_int8_t rate11a; /* rate thresh for 11a bss */
++ u_int8_t rate11b; /* for 11g sta in 11b bss */
++ u_int8_t rate11bOnly; /* for 11b sta */
++ u_int8_t pad2;
++};
++#endif /* _NET80211__IEEE80211_H_ */
+--- /dev/null
++++ b/src/drivers/driver_madwifi/net80211/ieee80211.h
+@@ -0,0 +1,940 @@
++/*-
++ * Copyright (c) 2001 Atsushi Onoe
++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ * derived from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * 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.
++ *
++ * $Id: ieee80211.h 2394 2007-05-30 01:41:18Z mtaylor $
++ */
++#ifndef _NET80211_IEEE80211_H_
++#define _NET80211_IEEE80211_H_
++
++/*
++ * 802.11 protocol definitions.
++ */
++
++#define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */
++/* is 802.11 address multicast/broadcast? */
++#define IEEE80211_IS_MULTICAST(_a) (*(_a) & 0x01)
++
++/* IEEE 802.11 PLCP header */
++struct ieee80211_plcp_hdr {
++ u_int16_t i_sfd;
++ u_int8_t i_signal;
++ u_int8_t i_service;
++ u_int16_t i_length;
++ u_int16_t i_crc;
++} __packed;
++
++#define IEEE80211_PLCP_SFD 0xF3A0
++#define IEEE80211_PLCP_SERVICE 0x00
++
++/*
++ * generic definitions for IEEE 802.11 frames
++ */
++struct ieee80211_frame {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr3[IEEE80211_ADDR_LEN];
++ u_int8_t i_seq[2];
++ /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
++ /* see below */
++} __packed;
++
++struct ieee80211_qosframe {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr3[IEEE80211_ADDR_LEN];
++ u_int8_t i_seq[2];
++ u_int8_t i_qos[2];
++ /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
++ /* see below */
++} __packed;
++
++struct ieee80211_qoscntl {
++ u_int8_t i_qos[2];
++};
++
++struct ieee80211_frame_addr4 {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr3[IEEE80211_ADDR_LEN];
++ u_int8_t i_seq[2];
++ u_int8_t i_addr4[IEEE80211_ADDR_LEN];
++} __packed;
++
++
++struct ieee80211_qosframe_addr4 {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr3[IEEE80211_ADDR_LEN];
++ u_int8_t i_seq[2];
++ u_int8_t i_addr4[IEEE80211_ADDR_LEN];
++ u_int8_t i_qos[2];
++} __packed;
++
++struct ieee80211_ctlframe_addr2 {
++ u_int8_t i_fc[2];
++ __le16 i_aidordur; /* AID or duration */
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++} __packed;
++
++#define IEEE80211_FC0_VERSION_MASK 0x03
++#define IEEE80211_FC0_VERSION_SHIFT 0
++#define IEEE80211_FC0_VERSION_0 0x00
++#define IEEE80211_FC0_TYPE_MASK 0x0c
++#define IEEE80211_FC0_TYPE_SHIFT 2
++#define IEEE80211_FC0_TYPE_MGT 0x00
++#define IEEE80211_FC0_TYPE_CTL 0x04
++#define IEEE80211_FC0_TYPE_DATA 0x08
++
++#define IEEE80211_FC0_SUBTYPE_MASK 0xf0
++#define IEEE80211_FC0_SUBTYPE_SHIFT 4
++/* for TYPE_MGT */
++#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ 0x00
++#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP 0x10
++#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ 0x20
++#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP 0x30
++#define IEEE80211_FC0_SUBTYPE_PROBE_REQ 0x40
++#define IEEE80211_FC0_SUBTYPE_PROBE_RESP 0x50
++#define IEEE80211_FC0_SUBTYPE_BEACON 0x80
++#define IEEE80211_FC0_SUBTYPE_ATIM 0x90
++#define IEEE80211_FC0_SUBTYPE_DISASSOC 0xa0
++#define IEEE80211_FC0_SUBTYPE_AUTH 0xb0
++#define IEEE80211_FC0_SUBTYPE_DEAUTH 0xc0
++#define IEEE80211_FC0_SUBTYPE_ACTION 0xd0
++/* for TYPE_CTL */
++#define IEEE80211_FC0_SUBTYPE_PS_POLL 0xa0
++#define IEEE80211_FC0_SUBTYPE_RTS 0xb0
++#define IEEE80211_FC0_SUBTYPE_CTS 0xc0
++#define IEEE80211_FC0_SUBTYPE_ACK 0xd0
++#define IEEE80211_FC0_SUBTYPE_CF_END 0xe0
++#define IEEE80211_FC0_SUBTYPE_CF_END_ACK 0xf0
++/* for TYPE_DATA (bit combination) */
++#define IEEE80211_FC0_SUBTYPE_DATA 0x00
++#define IEEE80211_FC0_SUBTYPE_CF_ACK 0x10
++#define IEEE80211_FC0_SUBTYPE_CF_POLL 0x20
++#define IEEE80211_FC0_SUBTYPE_CF_ACPL 0x30
++#define IEEE80211_FC0_SUBTYPE_NODATA 0x40
++#define IEEE80211_FC0_SUBTYPE_CFACK 0x50
++#define IEEE80211_FC0_SUBTYPE_CFPOLL 0x60
++#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
++#define IEEE80211_FC0_SUBTYPE_QOS 0x80
++#define IEEE80211_FC0_SUBTYPE_QOS_NULL 0xc0
++
++#define IEEE80211_FC1_DIR_MASK 0x03
++#define IEEE80211_FC1_DIR_NODS 0x00 /* STA->STA */
++#define IEEE80211_FC1_DIR_TODS 0x01 /* STA->AP */
++#define IEEE80211_FC1_DIR_FROMDS 0x02 /* AP ->STA */
++#define IEEE80211_FC1_DIR_DSTODS 0x03 /* AP ->AP */
++
++#define IEEE80211_FC1_MORE_FRAG 0x04
++#define IEEE80211_FC1_RETRY 0x08
++#define IEEE80211_FC1_PWR_MGT 0x10
++#define IEEE80211_FC1_MORE_DATA 0x20
++#define IEEE80211_FC1_PROT 0x40
++#define IEEE80211_FC1_ORDER 0x80
++
++#define IEEE80211_SEQ_FRAG_MASK 0x000f
++#define IEEE80211_SEQ_FRAG_SHIFT 0
++#define IEEE80211_SEQ_SEQ_MASK 0xfff0
++#define IEEE80211_SEQ_SEQ_SHIFT 4
++
++#define IEEE80211_SEQ_LEQ(a,b) ((int)((a)-(b)) <= 0)
++
++#define IEEE80211_NWID_LEN 32
++
++#define IEEE80211_QOS_TXOP 0x00ff
++/* bit 8 is reserved */
++#define IEEE80211_QOS_ACKPOLICY 0x60
++#define IEEE80211_QOS_ACKPOLICY_S 5
++#define IEEE80211_QOS_EOSP 0x10
++#define IEEE80211_QOS_EOSP_S 4
++#define IEEE80211_QOS_TID 0x0f
++
++/*
++ * Country/Region Codes from MS WINNLS.H
++ * Numbering from ISO 3166
++ * XXX belongs elsewhere
++ */
++enum CountryCode {
++ CTRY_ALBANIA = 8, /* Albania */
++ CTRY_ALGERIA = 12, /* Algeria */
++ CTRY_ARGENTINA = 32, /* Argentina */
++ CTRY_ARMENIA = 51, /* Armenia */
++ CTRY_AUSTRALIA = 36, /* Australia */
++ CTRY_AUSTRIA = 40, /* Austria */
++ CTRY_AZERBAIJAN = 31, /* Azerbaijan */
++ CTRY_BAHRAIN = 48, /* Bahrain */
++ CTRY_BELARUS = 112, /* Belarus */
++ CTRY_BELGIUM = 56, /* Belgium */
++ CTRY_BELIZE = 84, /* Belize */
++ CTRY_BOLIVIA = 68, /* Bolivia */
++ CTRY_BRAZIL = 76, /* Brazil */
++ CTRY_BRUNEI_DARUSSALAM = 96, /* Brunei Darussalam */
++ CTRY_BULGARIA = 100, /* Bulgaria */
++ CTRY_CANADA = 124, /* Canada */
++ CTRY_CHILE = 152, /* Chile */
++ CTRY_CHINA = 156, /* People's Republic of China */
++ CTRY_COLOMBIA = 170, /* Colombia */
++ CTRY_COSTA_RICA = 188, /* Costa Rica */
++ CTRY_CROATIA = 191, /* Croatia */
++ CTRY_CYPRUS = 196,
++ CTRY_CZECH = 203, /* Czech Republic */
++ CTRY_DENMARK = 208, /* Denmark */
++ CTRY_DOMINICAN_REPUBLIC = 214, /* Dominican Republic */
++ CTRY_ECUADOR = 218, /* Ecuador */
++ CTRY_EGYPT = 818, /* Egypt */
++ CTRY_EL_SALVADOR = 222, /* El Salvador */
++ CTRY_ESTONIA = 233, /* Estonia */
++ CTRY_FAEROE_ISLANDS = 234, /* Faeroe Islands */
++ CTRY_FINLAND = 246, /* Finland */
++ CTRY_FRANCE = 250, /* France */
++ CTRY_FRANCE2 = 255, /* France2 */
++ CTRY_GEORGIA = 268, /* Georgia */
++ CTRY_GERMANY = 276, /* Germany */
++ CTRY_GREECE = 300, /* Greece */
++ CTRY_GUATEMALA = 320, /* Guatemala */
++ CTRY_HONDURAS = 340, /* Honduras */
++ CTRY_HONG_KONG = 344, /* Hong Kong S.A.R., P.R.C. */
++ CTRY_HUNGARY = 348, /* Hungary */
++ CTRY_ICELAND = 352, /* Iceland */
++ CTRY_INDIA = 356, /* India */
++ CTRY_INDONESIA = 360, /* Indonesia */
++ CTRY_IRAN = 364, /* Iran */
++ CTRY_IRAQ = 368, /* Iraq */
++ CTRY_IRELAND = 372, /* Ireland */
++ CTRY_ISRAEL = 376, /* Israel */
++ CTRY_ITALY = 380, /* Italy */
++ CTRY_JAMAICA = 388, /* Jamaica */
++ CTRY_JAPAN = 392, /* Japan */
++ CTRY_JAPAN1 = 393, /* Japan (JP1) */
++ CTRY_JAPAN2 = 394, /* Japan (JP0) */
++ CTRY_JAPAN3 = 395, /* Japan (JP1-1) */
++ CTRY_JAPAN4 = 396, /* Japan (JE1) */
++ CTRY_JAPAN5 = 397, /* Japan (JE2) */
++ CTRY_JAPAN6 = 399, /* Japan (JP6) */
++ CTRY_JAPAN7 = 900, /* Japan */
++ CTRY_JAPAN8 = 901, /* Japan */
++ CTRY_JAPAN9 = 902, /* Japan */
++ CTRY_JAPAN10 = 903, /* Japan */
++ CTRY_JAPAN11 = 904, /* Japan */
++ CTRY_JAPAN12 = 905, /* Japan */
++ CTRY_JAPAN13 = 906, /* Japan */
++ CTRY_JAPAN14 = 907, /* Japan */
++ CTRY_JAPAN15 = 908, /* Japan */
++ CTRY_JAPAN16 = 909, /* Japan */
++ CTRY_JAPAN17 = 910, /* Japan */
++ CTRY_JAPAN18 = 911, /* Japan */
++ CTRY_JAPAN19 = 912, /* Japan */
++ CTRY_JAPAN20 = 913, /* Japan */
++ CTRY_JAPAN21 = 914, /* Japan */
++ CTRY_JAPAN22 = 915, /* Japan */
++ CTRY_JAPAN23 = 916, /* Japan */
++ CTRY_JAPAN24 = 917, /* Japan */
++ CTRY_JAPAN25 = 918, /* Japan */
++ CTRY_JAPAN26 = 919, /* Japan */
++ CTRY_JAPAN27 = 920, /* Japan */
++ CTRY_JAPAN28 = 921, /* Japan */
++ CTRY_JAPAN29 = 922, /* Japan */
++ CTRY_JAPAN30 = 923, /* Japan */
++ CTRY_JAPAN31 = 924, /* Japan */
++ CTRY_JAPAN32 = 925, /* Japan */
++ CTRY_JAPAN33 = 926, /* Japan */
++ CTRY_JAPAN34 = 927, /* Japan */
++ CTRY_JAPAN35 = 928, /* Japan */
++ CTRY_JAPAN36 = 929, /* Japan */
++ CTRY_JAPAN37 = 930, /* Japan */
++ CTRY_JAPAN38 = 931, /* Japan */
++ CTRY_JAPAN39 = 932, /* Japan */
++ CTRY_JAPAN40 = 933, /* Japan */
++ CTRY_JAPAN41 = 934, /* Japan */
++ CTRY_JAPAN42 = 935, /* Japan */
++ CTRY_JAPAN43 = 936, /* Japan */
++ CTRY_JAPAN44 = 937, /* Japan */
++ CTRY_JAPAN45 = 938, /* Japan */
++ CTRY_JAPAN46 = 939, /* Japan */
++ CTRY_JAPAN47 = 940, /* Japan */
++ CTRY_JAPAN48 = 941, /* Japan */
++ CTRY_JORDAN = 400, /* Jordan */
++ CTRY_KAZAKHSTAN = 398, /* Kazakhstan */
++ CTRY_KENYA = 404, /* Kenya */
++ CTRY_KOREA_NORTH = 408, /* North Korea */
++ CTRY_KOREA_ROC = 410, /* South Korea */
++ CTRY_KOREA_ROC2 = 411, /* South Korea */
++ CTRY_KUWAIT = 414, /* Kuwait */
++ CTRY_LATVIA = 428, /* Latvia */
++ CTRY_LEBANON = 422, /* Lebanon */
++ CTRY_LIBYA = 434, /* Libya */
++ CTRY_LIECHTENSTEIN = 438, /* Liechtenstein */
++ CTRY_LITHUANIA = 440, /* Lithuania */
++ CTRY_LUXEMBOURG = 442, /* Luxembourg */
++ CTRY_MACAU = 446, /* Macau */
++ CTRY_MACEDONIA = 807, /* the Former Yugoslav Republic of Macedonia */
++ CTRY_MALAYSIA = 458, /* Malaysia */
++ CTRY_MEXICO = 484, /* Mexico */
++ CTRY_MONACO = 492, /* Principality of Monaco */
++ CTRY_MOROCCO = 504, /* Morocco */
++ CTRY_NETHERLANDS = 528, /* Netherlands */
++ CTRY_NEW_ZEALAND = 554, /* New Zealand */
++ CTRY_NICARAGUA = 558, /* Nicaragua */
++ CTRY_NORWAY = 578, /* Norway */
++ CTRY_OMAN = 512, /* Oman */
++ CTRY_PAKISTAN = 586, /* Islamic Republic of Pakistan */
++ CTRY_PANAMA = 591, /* Panama */
++ CTRY_PARAGUAY = 600, /* Paraguay */
++ CTRY_PERU = 604, /* Peru */
++ CTRY_PHILIPPINES = 608, /* Republic of the Philippines */
++ CTRY_POLAND = 616, /* Poland */
++ CTRY_PORTUGAL = 620, /* Portugal */
++ CTRY_PUERTO_RICO = 630, /* Puerto Rico */
++ CTRY_QATAR = 634, /* Qatar */
++ CTRY_ROMANIA = 642, /* Romania */
++ CTRY_RUSSIA = 643, /* Russia */
++ CTRY_SAUDI_ARABIA = 682, /* Saudi Arabia */
++ CTRY_SINGAPORE = 702, /* Singapore */
++ CTRY_SLOVAKIA = 703, /* Slovak Republic */
++ CTRY_SLOVENIA = 705, /* Slovenia */
++ CTRY_SOUTH_AFRICA = 710, /* South Africa */
++ CTRY_SPAIN = 724, /* Spain */
++ CTRY_SWEDEN = 752, /* Sweden */
++ CTRY_SWITZERLAND = 756, /* Switzerland */
++ CTRY_SYRIA = 760, /* Syria */
++ CTRY_TAIWAN = 158, /* Taiwan */
++ CTRY_THAILAND = 764, /* Thailand */
++ CTRY_TRINIDAD_Y_TOBAGO = 780, /* Trinidad y Tobago */
++ CTRY_TUNISIA = 788, /* Tunisia */
++ CTRY_TURKEY = 792, /* Turkey */
++ CTRY_UAE = 784, /* U.A.E. */
++ CTRY_UKRAINE = 804, /* Ukraine */
++ CTRY_UNITED_KINGDOM = 826, /* United Kingdom */
++ CTRY_UNITED_STATES = 840, /* United States */
++ CTRY_UNITED_STATES_FCC49 = 842, /* United States (Public Safety)*/
++ CTRY_URUGUAY = 858, /* Uruguay */
++ CTRY_UZBEKISTAN = 860, /* Uzbekistan */
++ CTRY_VENEZUELA = 862, /* Venezuela */
++ CTRY_VIET_NAM = 704, /* Viet Nam */
++ CTRY_YEMEN = 887, /* Yemen */
++ CTRY_ZIMBABWE = 716 /* Zimbabwe */
++};
++
++/*
++ * Generic information element
++ */
++struct ieee80211_ie {
++ u_int8_t id;
++ u_int8_t len;
++ u_int8_t info[0];
++} __packed;
++
++/*
++ * Country information element.
++ */
++#define IEEE80211_COUNTRY_MAX_TRIPLETS (83)
++struct ieee80211_ie_country {
++ u_int8_t country_id;
++ u_int8_t country_len;
++ u_int8_t country_str[3];
++ u_int8_t country_triplet[IEEE80211_COUNTRY_MAX_TRIPLETS * 3];
++} __packed;
++
++/*
++ * Channel Switch Announcement information element.
++ */
++struct ieee80211_ie_csa {
++ u_int8_t csa_id; /* IEEE80211_ELEMID_CHANSWITCHANN */
++ u_int8_t csa_len; /* == 3 */
++ u_int8_t csa_mode; /* Channel Switch Mode: 1 == stop transmission until CS */
++ u_int8_t csa_chan; /* New Channel Number */
++ u_int8_t csa_count; /* TBTTs until Channel Switch happens */
++} __packed;
++
++/* minimal Channel Switch Count in the initial announcement */
++#define IEEE80211_CSA_PROTECTION_PERIOD 3
++
++/* maximum allowed deviance of measurement of intervals between CSA in Beacons */
++#define IEEE80211_CSA_SANITY_THRESHOLD 100
++
++
++/* does frame have QoS sequence control data */
++#define IEEE80211_QOS_HAS_SEQ(wh) \
++ (((wh)->i_fc[0] & \
++ (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
++ (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
++
++#define WME_QOSINFO_COUNT 0x0f /* Mask for Param Set Count field */
++/*
++ * WME/802.11e information element.
++ */
++struct ieee80211_ie_wme {
++ u_int8_t wme_id; /* IEEE80211_ELEMID_VENDOR */
++ u_int8_t wme_len; /* length in bytes */
++ u_int8_t wme_oui[3]; /* 0x00, 0x50, 0xf2 */
++ u_int8_t wme_type; /* OUI type */
++ u_int8_t wme_subtype; /* OUI subtype */
++ u_int8_t wme_version; /* spec revision */
++ u_int8_t wme_info; /* QoS info */
++} __packed;
++
++/*
++ * WME/802.11e Tspec Element
++ */
++struct ieee80211_wme_tspec {
++ u_int8_t ts_id;
++ u_int8_t ts_len;
++ u_int8_t ts_oui[3];
++ u_int8_t ts_oui_type;
++ u_int8_t ts_oui_subtype;
++ u_int8_t ts_version;
++ u_int8_t ts_tsinfo[3];
++ u_int8_t ts_nom_msdu[2];
++ u_int8_t ts_max_msdu[2];
++ u_int8_t ts_min_svc[4];
++ u_int8_t ts_max_svc[4];
++ u_int8_t ts_inactv_intv[4];
++ u_int8_t ts_susp_intv[4];
++ u_int8_t ts_start_svc[4];
++ u_int8_t ts_min_rate[4];
++ u_int8_t ts_mean_rate[4];
++ u_int8_t ts_max_burst[4];
++ u_int8_t ts_min_phy[4];
++ u_int8_t ts_peak_rate[4];
++ u_int8_t ts_delay[4];
++ u_int8_t ts_surplus[2];
++ u_int8_t ts_medium_time[2];
++} __packed;
++
++/*
++ * WME AC parameter field
++ */
++
++struct ieee80211_wme_acparams {
++ u_int8_t acp_aci_aifsn;
++ u_int8_t acp_logcwminmax;
++ u_int16_t acp_txop;
++} __packed;
++
++#define IEEE80211_WME_PARAM_LEN 24
++#define WME_NUM_AC 4 /* 4 AC categories */
++
++#define WME_PARAM_ACI 0x60 /* Mask for ACI field */
++#define WME_PARAM_ACI_S 5 /* Shift for ACI field */
++#define WME_PARAM_ACM 0x10 /* Mask for ACM bit */
++#define WME_PARAM_ACM_S 4 /* Shift for ACM bit */
++#define WME_PARAM_AIFSN 0x0f /* Mask for aifsn field */
++#define WME_PARAM_AIFSN_S 0 /* Shift for aifsn field */
++#define WME_PARAM_LOGCWMIN 0x0f /* Mask for CwMin field (in log) */
++#define WME_PARAM_LOGCWMIN_S 0 /* Shift for CwMin field */
++#define WME_PARAM_LOGCWMAX 0xf0 /* Mask for CwMax field (in log) */
++#define WME_PARAM_LOGCWMAX_S 4 /* Shift for CwMax field */
++
++#define WME_AC_TO_TID(_ac) ( \
++ ((_ac) == WME_AC_VO) ? 6 : \
++ ((_ac) == WME_AC_VI) ? 5 : \
++ ((_ac) == WME_AC_BK) ? 1 : \
++ 0)
++
++#define TID_TO_WME_AC(_tid) ( \
++ ((_tid) < 1) ? WME_AC_BE : \
++ ((_tid) < 3) ? WME_AC_BK : \
++ ((_tid) < 6) ? WME_AC_VI : \
++ WME_AC_VO)
++
++/*
++ * WME Parameter Element
++ */
++
++struct ieee80211_wme_param {
++ u_int8_t param_id;
++ u_int8_t param_len;
++ u_int8_t param_oui[3];
++ u_int8_t param_oui_type;
++ u_int8_t param_oui_sybtype;
++ u_int8_t param_version;
++ u_int8_t param_qosInfo;
++ u_int8_t param_reserved;
++ struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
++} __packed;
++
++/*
++ * WME U-APSD qos info field defines
++ */
++#define WME_CAPINFO_UAPSD_EN 0x00000080
++#define WME_CAPINFO_UAPSD_VO 0x00000001
++#define WME_CAPINFO_UAPSD_VI 0x00000002
++#define WME_CAPINFO_UAPSD_BK 0x00000004
++#define WME_CAPINFO_UAPSD_BE 0x00000008
++#define WME_CAPINFO_UAPSD_ACFLAGS_SHIFT 0
++#define WME_CAPINFO_UAPSD_ACFLAGS_MASK 0xF
++#define WME_CAPINFO_UAPSD_MAXSP_SHIFT 5
++#define WME_CAPINFO_UAPSD_MAXSP_MASK 0x3
++#define WME_CAPINFO_IE_OFFSET 8
++#define WME_UAPSD_MAXSP(_qosinfo) (((_qosinfo) >> WME_CAPINFO_UAPSD_MAXSP_SHIFT) & WME_CAPINFO_UAPSD_MAXSP_MASK)
++#define WME_UAPSD_AC_ENABLED(_ac, _qosinfo) ( (1<<(3 - (_ac))) & \
++ (((_qosinfo) >> WME_CAPINFO_UAPSD_ACFLAGS_SHIFT) & WME_CAPINFO_UAPSD_ACFLAGS_MASK) )
++
++/*
++ * Atheros Advanced Capability information element.
++ */
++struct ieee80211_ie_athAdvCap {
++ u_int8_t athAdvCap_id; /* IEEE80211_ELEMID_VENDOR */
++ u_int8_t athAdvCap_len; /* length in bytes */
++ u_int8_t athAdvCap_oui[3]; /* 0x00, 0x03, 0x7f */
++ u_int8_t athAdvCap_type; /* OUI type */
++ u_int8_t athAdvCap_subtype; /* OUI subtype */
++ u_int8_t athAdvCap_version; /* spec revision */
++ u_int8_t athAdvCap_capability; /* Capability info */
++ u_int16_t athAdvCap_defKeyIndex;
++} __packed;
++
++/*
++ * Atheros XR information element.
++ */
++struct ieee80211_xr_param {
++ u_int8_t param_id;
++ u_int8_t param_len;
++ u_int8_t param_oui[3];
++ u_int8_t param_oui_type;
++ u_int8_t param_oui_sybtype;
++ u_int8_t param_version;
++ u_int8_t param_Info;
++ u_int8_t param_base_bssid[IEEE80211_ADDR_LEN];
++ u_int8_t param_xr_bssid[IEEE80211_ADDR_LEN];
++ u_int16_t param_xr_beacon_interval;
++ u_int8_t param_base_ath_capability;
++ u_int8_t param_xr_ath_capability;
++} __packed;
++
++/* Atheros capabilities */
++#define IEEE80211_ATHC_TURBOP 0x0001 /* Turbo Prime */
++#define IEEE80211_ATHC_COMP 0x0002 /* Compression */
++#define IEEE80211_ATHC_FF 0x0004 /* Fast Frames */
++#define IEEE80211_ATHC_XR 0x0008 /* Xtended Range support */
++#define IEEE80211_ATHC_AR 0x0010 /* Advanced Radar support */
++#define IEEE80211_ATHC_BURST 0x0020 /* Bursting - not negotiated */
++#define IEEE80211_ATHC_WME 0x0040 /* CWMin tuning */
++#define IEEE80211_ATHC_BOOST 0x0080 /* Boost */
++
++/*
++ * Management Notification Frame
++ */
++struct ieee80211_mnf {
++ u_int8_t mnf_category;
++ u_int8_t mnf_action;
++ u_int8_t mnf_dialog;
++ u_int8_t mnf_status;
++} __packed;
++#define MNF_SETUP_REQ 0
++#define MNF_SETUP_RESP 1
++#define MNF_TEARDOWN 2
++
++/*
++ * Control frames.
++ */
++struct ieee80211_frame_min {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_addr1[IEEE80211_ADDR_LEN];
++ u_int8_t i_addr2[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++struct ieee80211_frame_rts {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_ra[IEEE80211_ADDR_LEN];
++ u_int8_t i_ta[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++struct ieee80211_frame_cts {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_ra[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++struct ieee80211_frame_ack {
++ u_int8_t i_fc[2];
++ __le16 i_dur;
++ u_int8_t i_ra[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++struct ieee80211_frame_pspoll {
++ u_int8_t i_fc[2];
++ u_int8_t i_aid[2];
++ u_int8_t i_bssid[IEEE80211_ADDR_LEN];
++ u_int8_t i_ta[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
++ u_int8_t i_fc[2];
++ __le16 i_dur; /* should be zero */
++ u_int8_t i_ra[IEEE80211_ADDR_LEN];
++ u_int8_t i_bssid[IEEE80211_ADDR_LEN];
++ /* FCS */
++} __packed;
++
++/*
++ * BEACON management packets
++ *
++ * octet timestamp[8]
++ * octet beacon interval[2]
++ * octet capability information[2]
++ * information element
++ * octet elemid
++ * octet length
++ * octet information[length]
++ */
++
++typedef u_int8_t *ieee80211_mgt_beacon_t;
++
++#define IEEE80211_BEACON_INTERVAL(beacon) \
++ ((beacon)[8] | ((beacon)[9] << 8))
++#define IEEE80211_BEACON_CAPABILITY(beacon) \
++ ((beacon)[10] | ((beacon)[11] << 8))
++
++#define IEEE80211_CAPINFO_ESS 0x0001
++#define IEEE80211_CAPINFO_IBSS 0x0002
++#define IEEE80211_CAPINFO_CF_POLLABLE 0x0004
++#define IEEE80211_CAPINFO_CF_POLLREQ 0x0008
++#define IEEE80211_CAPINFO_PRIVACY 0x0010
++#define IEEE80211_CAPINFO_SHORT_PREAMBLE 0x0020
++#define IEEE80211_CAPINFO_PBCC 0x0040
++#define IEEE80211_CAPINFO_CHNL_AGILITY 0x0080
++/* bits 8-9 are reserved (8 now for spectrum management) */
++#define IEEE80211_CAPINFO_SPECTRUM_MGMT 0x0100
++#define IEEE80211_CAPINFO_SHORT_SLOTTIME 0x0400
++#define IEEE80211_CAPINFO_RSN 0x0800
++/* bit 12 is reserved */
++#define IEEE80211_CAPINFO_DSSSOFDM 0x2000
++/* bits 14-15 are reserved */
++
++/*
++ * 802.11i/WPA information element (maximally sized).
++ */
++struct ieee80211_ie_wpa {
++ u_int8_t wpa_id; /* IEEE80211_ELEMID_VENDOR */
++ u_int8_t wpa_len; /* length in bytes */
++ u_int8_t wpa_oui[3]; /* 0x00, 0x50, 0xf2 */
++ u_int8_t wpa_type; /* OUI type */
++ u_int16_t wpa_version; /* spec revision */
++ u_int32_t wpa_mcipher[1]; /* multicast/group key cipher */
++ u_int16_t wpa_uciphercnt; /* # pairwise key ciphers */
++ u_int32_t wpa_uciphers[8]; /* ciphers */
++ u_int16_t wpa_authselcnt; /* authentication selector cnt*/
++ u_int32_t wpa_authsels[8]; /* selectors */
++ u_int16_t wpa_caps; /* 802.11i capabilities */
++ u_int16_t wpa_pmkidcnt; /* 802.11i pmkid count */
++ u_int16_t wpa_pmkids[8]; /* 802.11i pmkids */
++} __packed;
++
++/*
++ * Management information element payloads.
++ */
++
++enum {
++ IEEE80211_ELEMID_SSID = 0,
++ IEEE80211_ELEMID_RATES = 1,
++ IEEE80211_ELEMID_FHPARMS = 2,
++ IEEE80211_ELEMID_DSPARMS = 3,
++ IEEE80211_ELEMID_CFPARMS = 4,
++ IEEE80211_ELEMID_TIM = 5,
++ IEEE80211_ELEMID_IBSSPARMS = 6,
++ IEEE80211_ELEMID_COUNTRY = 7,
++ IEEE80211_ELEMID_REQINFO = 10,
++ IEEE80211_ELEMID_CHALLENGE = 16,
++ /* 17-31 reserved for challenge text extension */
++ IEEE80211_ELEMID_PWRCNSTR = 32,
++ IEEE80211_ELEMID_PWRCAP = 33,
++ IEEE80211_ELEMID_TPCREQ = 34,
++ IEEE80211_ELEMID_TPCREP = 35,
++ IEEE80211_ELEMID_SUPPCHAN = 36,
++ IEEE80211_ELEMID_CHANSWITCHANN = 37,
++ IEEE80211_ELEMID_MEASREQ = 38,
++ IEEE80211_ELEMID_MEASREP = 39,
++ IEEE80211_ELEMID_QUIET = 40,
++ IEEE80211_ELEMID_IBSSDFS = 41,
++ IEEE80211_ELEMID_ERP = 42,
++ IEEE80211_ELEMID_RSN = 48,
++ IEEE80211_ELEMID_XRATES = 50,
++ /* 128-129 proprietary elements used by Agere chipsets */
++ IEEE80211_ELEMID_AGERE1 = 128,
++ IEEE80211_ELEMID_AGERE2 = 129,
++ IEEE80211_ELEMID_TPC = 150,
++ IEEE80211_ELEMID_CCKM = 156,
++ IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
++};
++
++#define IEEE80211_CHANSWITCHANN_BYTES 5
++
++struct ieee80211_tim_ie {
++ u_int8_t tim_ie; /* IEEE80211_ELEMID_TIM */
++ u_int8_t tim_len;
++ u_int8_t tim_count; /* DTIM count */
++ u_int8_t tim_period; /* DTIM period */
++ u_int8_t tim_bitctl; /* bitmap control */
++ u_int8_t tim_bitmap[1]; /* variable-length bitmap */
++} __packed;
++
++struct ieee80211_country_ie {
++ u_int8_t ie; /* IEEE80211_ELEMID_COUNTRY */
++ u_int8_t len;
++ u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */
++ struct {
++ u_int8_t schan; /* starting channel */
++ u_int8_t nchan; /* number channels */
++ u_int8_t maxtxpwr; /* tx power cap */
++ } __packed band[4]; /* up to 4 sub bands */
++} __packed;
++
++#define IEEE80211_CHALLENGE_LEN 128
++
++#define IEEE80211_SUPPCHAN_LEN 26
++
++#define IEEE80211_RATE_BASIC 0x80
++#define IEEE80211_RATE_VAL 0x7f
++
++/* EPR information element flags */
++#define IEEE80211_ERP_NON_ERP_PRESENT 0x01
++#define IEEE80211_ERP_USE_PROTECTION 0x02
++#define IEEE80211_ERP_LONG_PREAMBLE 0x04
++
++/* Atheros private advanced capabilities info */
++#define ATHEROS_CAP_TURBO_PRIME 0x01
++#define ATHEROS_CAP_COMPRESSION 0x02
++#define ATHEROS_CAP_FAST_FRAME 0x04
++/* bits 3-6 reserved */
++#define ATHEROS_CAP_BOOST 0x80
++
++#define ATH_OUI 0x7f0300 /* Atheros OUI */
++#define ATH_OUI_TYPE 0x01
++#define ATH_OUI_SUBTYPE 0x01
++#define ATH_OUI_VERSION 0x00
++#define ATH_OUI_TYPE_XR 0x03
++#define ATH_OUI_SUBTYPE_XR 0x01
++#define ATH_OUI_VER_XR 0x00
++
++#define WPA_OUI 0xf25000
++#define WPA_OUI_TYPE 0x01
++#define WPA_VERSION 1 /* current supported version */
++
++#define WPA_CSE_NULL 0x00
++#define WPA_CSE_WEP40 0x01
++#define WPA_CSE_TKIP 0x02
++#define WPA_CSE_CCMP 0x04
++#define WPA_CSE_WEP104 0x05
++
++#define WPA_ASE_NONE 0x00
++#define WPA_ASE_8021X_UNSPEC 0x01
++#define WPA_ASE_8021X_PSK 0x02
++
++#define RSN_OUI 0xac0f00
++#define RSN_VERSION 1 /* current supported version */
++
++#define RSN_CSE_NULL 0x00
++#define RSN_CSE_WEP40 0x01
++#define RSN_CSE_TKIP 0x02
++#define RSN_CSE_WRAP 0x03
++#define RSN_CSE_CCMP 0x04
++#define RSN_CSE_WEP104 0x05
++
++#define RSN_ASE_NONE 0x00
++#define RSN_ASE_8021X_UNSPEC 0x01
++#define RSN_ASE_8021X_PSK 0x02
++
++#define RSN_CAP_PREAUTH 0x01
++
++#define WME_OUI 0xf25000
++#define WME_OUI_TYPE 0x02
++#define WME_INFO_OUI_SUBTYPE 0x00
++#define WME_PARAM_OUI_SUBTYPE 0x01
++#define WME_VERSION 1
++
++/* WME stream classes */
++#define WME_AC_BE 0 /* best effort */
++#define WME_AC_BK 1 /* background */
++#define WME_AC_VI 2 /* video */
++#define WME_AC_VO 3 /* voice */
++
++/*
++ * AUTH management packets
++ *
++ * octet algo[2]
++ * octet seq[2]
++ * octet status[2]
++ * octet chal.id
++ * octet chal.length
++ * octet chal.text[253]
++ */
++
++typedef u_int8_t *ieee80211_mgt_auth_t;
++
++#define IEEE80211_AUTH_ALGORITHM(auth) \
++ ((auth)[0] | ((auth)[1] << 8))
++#define IEEE80211_AUTH_TRANSACTION(auth) \
++ ((auth)[2] | ((auth)[3] << 8))
++#define IEEE80211_AUTH_STATUS(auth) \
++ ((auth)[4] | ((auth)[5] << 8))
++
++#define IEEE80211_AUTH_ALG_OPEN 0x0000
++#define IEEE80211_AUTH_ALG_SHARED 0x0001
++#define IEEE80211_AUTH_ALG_LEAP 0x0080
++
++enum {
++ IEEE80211_AUTH_OPEN_REQUEST = 1,
++ IEEE80211_AUTH_OPEN_RESPONSE = 2,
++};
++
++enum {
++ IEEE80211_AUTH_SHARED_REQUEST = 1,
++ IEEE80211_AUTH_SHARED_CHALLENGE = 2,
++ IEEE80211_AUTH_SHARED_RESPONSE = 3,
++ IEEE80211_AUTH_SHARED_PASS = 4,
++};
++
++/*
++ * Reason codes
++ *
++ * Unlisted codes are reserved
++ */
++
++enum {
++ IEEE80211_REASON_UNSPECIFIED = 1,
++ IEEE80211_REASON_AUTH_EXPIRE = 2,
++ IEEE80211_REASON_AUTH_LEAVE = 3,
++ IEEE80211_REASON_ASSOC_EXPIRE = 4,
++ IEEE80211_REASON_ASSOC_TOOMANY = 5,
++ IEEE80211_REASON_NOT_AUTHED = 6,
++ IEEE80211_REASON_NOT_ASSOCED = 7,
++ IEEE80211_REASON_ASSOC_LEAVE = 8,
++ IEEE80211_REASON_ASSOC_NOT_AUTHED = 9,
++
++ IEEE80211_REASON_RSN_REQUIRED = 11,
++ IEEE80211_REASON_RSN_INCONSISTENT = 12,
++ IEEE80211_REASON_IE_INVALID = 13,
++ IEEE80211_REASON_MIC_FAILURE = 14,
++
++ IEEE80211_STATUS_SUCCESS = 0,
++ IEEE80211_STATUS_UNSPECIFIED = 1,
++ IEEE80211_STATUS_CAPINFO = 10,
++ IEEE80211_STATUS_NOT_ASSOCED = 11,
++ IEEE80211_STATUS_OTHER = 12,
++ IEEE80211_STATUS_ALG = 13,
++ IEEE80211_STATUS_SEQUENCE = 14,
++ IEEE80211_STATUS_CHALLENGE = 15,
++ IEEE80211_STATUS_TIMEOUT = 16,
++ IEEE80211_STATUS_TOOMANY = 17,
++ IEEE80211_STATUS_BASIC_RATE = 18,
++ IEEE80211_STATUS_SP_REQUIRED = 19,
++ IEEE80211_STATUS_PBCC_REQUIRED = 20,
++ IEEE80211_STATUS_CA_REQUIRED = 21,
++ IEEE80211_STATUS_TOO_MANY_STATIONS = 22,
++ IEEE80211_STATUS_RATES = 23,
++ IEEE80211_STATUS_SHORTSLOT_REQUIRED = 25,
++ IEEE80211_STATUS_DSSSOFDM_REQUIRED = 26,
++};
++
++#define IEEE80211_WEP_KEYLEN 5 /* 40bit */
++#define IEEE80211_WEP_IVLEN 3 /* 24bit */
++#define IEEE80211_WEP_KIDLEN 1 /* 1 octet */
++#define IEEE80211_WEP_CRCLEN 4 /* CRC-32 */
++#define IEEE80211_WEP_NKID 4 /* number of key ids */
++
++/*
++ * 802.11i defines an extended IV for use with non-WEP ciphers.
++ * When the EXTIV bit is set in the key id byte an additional
++ * 4 bytes immediately follow the IV for TKIP. For CCMP the
++ * EXTIV bit is likewise set but the 8 bytes represent the
++ * CCMP header rather than IV+extended-IV.
++ */
++#define IEEE80211_WEP_EXTIV 0x20
++#define IEEE80211_WEP_EXTIVLEN 4 /* extended IV length */
++#define IEEE80211_WEP_MICLEN 8 /* trailing MIC */
++
++#define IEEE80211_CRC_LEN 4
++
++/*
++ * Maximum acceptable MTU is:
++ * IEEE80211_MAX_LEN - WEP overhead - CRC -
++ * QoS overhead - RSN/WPA overhead
++ * Min is arbitrarily chosen > IEEE80211_MIN_LEN. The default
++ * mtu is Ethernet-compatible; it's set by ether_ifattach.
++ */
++#define IEEE80211_MTU_MAX 2290
++#define IEEE80211_MTU_MIN 32
++
++#define IEEE80211_MAX_LEN (2300 + IEEE80211_CRC_LEN + \
++ (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
++#define IEEE80211_ACK_LEN \
++ (sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN)
++#define IEEE80211_MIN_LEN \
++ (sizeof(struct ieee80211_frame_min) + IEEE80211_CRC_LEN)
++
++/*
++ * The 802.11 spec says at most 2007 stations may be
++ * associated at once. For most AP's this is way more
++ * than is feasible so we use a default of 128. This
++ * number may be overridden by the driver and/or by
++ * user configuration.
++ */
++#define IEEE80211_AID_MAX 2007
++#define IEEE80211_AID_DEF 128
++
++#define IEEE80211_AID(b) ((b) &~ 0xc000)
++
++/*
++ * RTS frame length parameters. The default is specified in
++ * the 802.11 spec. The max may be wrong for jumbo frames.
++ */
++#define IEEE80211_RTS_DEFAULT 512
++#define IEEE80211_RTS_MIN 1
++#define IEEE80211_RTS_MAX 2346
++
++/*
++ * Regulatory extension identifier for country IE.
++ */
++#define IEEE80211_REG_EXT_ID 201
++
++/*
++ * IEEE 802.11 timer synchronization function (TSF) timestamp length
++ */
++#define IEEE80211_TSF_LEN 8
++
++#endif /* _NET80211_IEEE80211_H_ */
+--- /dev/null
++++ b/src/drivers/driver_madwifi/net80211/ieee80211_crypto.h
+@@ -0,0 +1,207 @@
++/*-
++ * Copyright (c) 2001 Atsushi Onoe
++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ * derived from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * 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.
++ *
++ * $Id: ieee80211_crypto.h 2278 2007-04-16 12:32:29Z proski $
++ */
++#ifndef _NET80211_IEEE80211_CRYPTO_H_
++#define _NET80211_IEEE80211_CRYPTO_H_
++
++/*
++ * 802.11 protocol crypto-related definitions.
++ */
++#define IEEE80211_KEYBUF_SIZE 16
++#define IEEE80211_MICBUF_SIZE (8 + 8) /* space for both TX & RX keys */
++#define IEEE80211_TID_SIZE 17 /* total number of TIDs */
++
++/*
++ * Old WEP-style key. Deprecated.
++ */
++struct ieee80211_wepkey {
++ u_int wk_len; /* key length in bytes */
++ u_int8_t wk_key[IEEE80211_KEYBUF_SIZE];
++};
++
++struct ieee80211_cipher;
++
++/*
++ * Crypto key state. There is sufficient room for all supported
++ * ciphers (see below). The underlying ciphers are handled
++ * separately through loadable cipher modules that register with
++ * the generic crypto support. A key has a reference to an instance
++ * of the cipher; any per-key state is hung off wk_private by the
++ * cipher when it is attached. Ciphers are automatically called
++ * to detach and cleanup any such state when the key is deleted.
++ *
++ * The generic crypto support handles encap/decap of cipher-related
++ * frame contents for both hardware- and software-based implementations.
++ * A key requiring software crypto support is automatically flagged and
++ * the cipher is expected to honor this and do the necessary work.
++ * Ciphers such as TKIP may also support mixed hardware/software
++ * encrypt/decrypt and MIC processing.
++ */
++
++typedef u_int16_t ieee80211_keyix_t;
++
++/* XXX pack better? */
++/* XXX 48-bit rsc/tsc */
++struct ieee80211_key {
++ u_int8_t wk_keylen; /* key length in bytes */
++ u_int8_t wk_flags;
++#define IEEE80211_KEY_XMIT 0x01 /* key used for xmit */
++#define IEEE80211_KEY_RECV 0x02 /* key used for recv */
++#define IEEE80211_KEY_GROUP 0x04 /* key used for WPA group operation */
++#define IEEE80211_KEY_SWCRYPT 0x10 /* host-based encrypt/decrypt */
++#define IEEE80211_KEY_SWMIC 0x20 /* host-based enmic/demic */
++ ieee80211_keyix_t wk_keyix; /* key index */
++ u_int8_t wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
++#define wk_txmic wk_key+IEEE80211_KEYBUF_SIZE+0 /* XXX can't () right */
++#define wk_rxmic wk_key+IEEE80211_KEYBUF_SIZE+8 /* XXX can't () right */
++ u_int64_t wk_keyrsc[IEEE80211_TID_SIZE]; /* key receive sequence counter */
++ u_int64_t wk_keytsc; /* key transmit sequence counter */
++ const struct ieee80211_cipher *wk_cipher;
++ void *wk_private; /* private cipher state */
++};
++#define IEEE80211_KEY_COMMON /* common flags passed in by apps */\
++ (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP)
++
++/*
++ * NB: these values are ordered carefully; there are lots of
++ * of implications in any reordering. In particular beware
++ * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
++ */
++#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 /* pseudo value */
++
++#define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_NONE + 1)
++
++#define IEEE80211_KEYIX_NONE ((ieee80211_keyix_t) -1)
++
++#if defined(__KERNEL__) || defined(_KERNEL)
++
++struct ieee80211com;
++struct ieee80211vap;
++struct ieee80211_node;
++struct sk_buff;
++
++void ieee80211_crypto_attach(struct ieee80211com *);
++void ieee80211_crypto_detach(struct ieee80211com *);
++void ieee80211_crypto_vattach(struct ieee80211vap *);
++void ieee80211_crypto_vdetach(struct ieee80211vap *);
++int ieee80211_crypto_newkey(struct ieee80211vap *, int, int,
++ struct ieee80211_key *);
++int ieee80211_crypto_delkey(struct ieee80211vap *, struct ieee80211_key *,
++ struct ieee80211_node *);
++int ieee80211_crypto_setkey(struct ieee80211vap *, struct ieee80211_key *,
++ const u_int8_t macaddr[IEEE80211_ADDR_LEN], struct ieee80211_node *);
++void ieee80211_crypto_delglobalkeys(struct ieee80211vap *);
++
++/*
++ * Template for a supported cipher. Ciphers register with the
++ * crypto code and are typically loaded as separate modules
++ * (the null cipher is always present).
++ * XXX may need refcnts
++ */
++struct ieee80211_cipher {
++ const char *ic_name; /* printable name */
++ u_int ic_cipher; /* IEEE80211_CIPHER_* */
++ u_int ic_header; /* size of privacy header (bytes) */
++ u_int ic_trailer; /* size of privacy trailer (bytes) */
++ u_int ic_miclen; /* size of mic trailer (bytes) */
++ void *(*ic_attach)(struct ieee80211vap *, struct ieee80211_key *);
++ void (*ic_detach)(struct ieee80211_key *);
++ int (*ic_setkey)(struct ieee80211_key *);
++ int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
++ int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
++ int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int);
++ int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int);
++};
++extern const struct ieee80211_cipher ieee80211_cipher_none;
++
++void ieee80211_crypto_register(const struct ieee80211_cipher *);
++void ieee80211_crypto_unregister(const struct ieee80211_cipher *);
++int ieee80211_crypto_available(struct ieee80211vap*, u_int);
++
++struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211_node *,
++ struct sk_buff *);
++struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211_node *,
++ struct sk_buff *, int);
++
++/*
++ * Check and remove any MIC.
++ */
++static __inline int
++ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
++ struct sk_buff *skb, int hdrlen)
++{
++ const struct ieee80211_cipher *cip = k->wk_cipher;
++ return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen) : 1);
++}
++
++/*
++ * Add any MIC.
++ */
++static __inline int
++ieee80211_crypto_enmic(struct ieee80211vap *vap, struct ieee80211_key *k,
++ struct sk_buff *skb, int force)
++{
++ const struct ieee80211_cipher *cip = k->wk_cipher;
++ return (cip->ic_miclen > 0 ? cip->ic_enmic(k, skb, force) : 1);
++}
++
++/*
++ * Reset key state to an unused state. The crypto
++ * key allocation mechanism ensures other state (e.g.
++ * key data) is properly setup before a key is used.
++ */
++static __inline void
++ieee80211_crypto_resetkey(struct ieee80211vap *vap, struct ieee80211_key *k,
++ ieee80211_keyix_t ix)
++{
++ k->wk_cipher = &ieee80211_cipher_none;;
++ k->wk_private = k->wk_cipher->ic_attach(vap, k);
++ k->wk_keyix = ix;
++ k->wk_flags = IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV;
++}
++
++/*
++ * Crypto-related notification methods.
++ */
++void ieee80211_notify_replay_failure(struct ieee80211vap *,
++ const struct ieee80211_frame *, const struct ieee80211_key *,
++ u_int64_t rsc);
++void ieee80211_notify_michael_failure(struct ieee80211vap *,
++ const struct ieee80211_frame *, ieee80211_keyix_t keyix);
++#endif /* defined(__KERNEL__) || defined(_KERNEL) */
++#endif /* _NET80211_IEEE80211_CRYPTO_H_ */
+--- /dev/null
++++ b/src/drivers/driver_madwifi/net80211/ieee80211_ioctl.h
+@@ -0,0 +1,664 @@
++/*-
++ * Copyright (c) 2001 Atsushi Onoe
++ * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ * derived from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * 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.
++ *
++ * $Id: ieee80211_ioctl.h 2394 2007-05-30 01:41:18Z mtaylor $
++ */
++#ifndef _NET80211_IEEE80211_IOCTL_H_
++#define _NET80211_IEEE80211_IOCTL_H_
++
++/*
++ * IEEE 802.11 ioctls.
++ */
++#include <net80211/_ieee80211.h>
++#include <net80211/ieee80211.h>
++#include <net80211/ieee80211_crypto.h>
++
++/*
++ * Per/node (station) statistics available when operating as an AP.
++ */
++struct ieee80211_nodestats {
++ u_int32_t ns_rx_data; /* rx data frames */
++ u_int32_t ns_rx_mgmt; /* rx management frames */
++ u_int32_t ns_rx_ctrl; /* rx control frames */
++ u_int32_t ns_rx_ucast; /* rx unicast frames */
++ u_int32_t ns_rx_mcast; /* rx multi/broadcast frames */
++ u_int64_t ns_rx_bytes; /* rx data count (bytes) */
++ u_int64_t ns_rx_beacons; /* rx beacon frames */
++ u_int32_t ns_rx_proberesp; /* rx probe response frames */
++
++ u_int32_t ns_rx_dup; /* rx discard because it's a dup */
++ u_int32_t ns_rx_noprivacy; /* rx w/ wep but privacy off */
++ u_int32_t ns_rx_wepfail; /* rx wep processing failed */
++ u_int32_t ns_rx_demicfail; /* rx demic failed */
++ u_int32_t ns_rx_decap; /* rx decapsulation failed */
++ u_int32_t ns_rx_defrag; /* rx defragmentation failed */
++ u_int32_t ns_rx_disassoc; /* rx disassociation */
++ u_int32_t ns_rx_deauth; /* rx deauthentication */
++ u_int32_t ns_rx_decryptcrc; /* rx decrypt failed on crc */
++ u_int32_t ns_rx_unauth; /* rx on unauthorized port */
++ u_int32_t ns_rx_unencrypted; /* rx unecrypted w/ privacy */
++
++ u_int32_t ns_tx_data; /* tx data frames */
++ u_int32_t ns_tx_mgmt; /* tx management frames */
++ u_int32_t ns_tx_ucast; /* tx unicast frames */
++ u_int32_t ns_tx_mcast; /* tx multi/broadcast frames */
++ u_int64_t ns_tx_bytes; /* tx data count (bytes) */
++ u_int32_t ns_tx_probereq; /* tx probe request frames */
++ u_int32_t ns_tx_uapsd; /* tx on uapsd queue */
++
++ u_int32_t ns_tx_novlantag; /* tx discard due to no tag */
++ u_int32_t ns_tx_vlanmismatch; /* tx discard due to of bad tag */
++
++ u_int32_t ns_tx_eosplost; /* uapsd EOSP retried out */
++
++ u_int32_t ns_ps_discard; /* ps discard due to of age */
++
++ u_int32_t ns_uapsd_triggers; /* uapsd triggers */
++
++ /* MIB-related state */
++ u_int32_t ns_tx_assoc; /* [re]associations */
++ u_int32_t ns_tx_assoc_fail; /* [re]association failures */
++ u_int32_t ns_tx_auth; /* [re]authentications */
++ u_int32_t ns_tx_auth_fail; /* [re]authentication failures*/
++ u_int32_t ns_tx_deauth; /* deauthentications */
++ u_int32_t ns_tx_deauth_code; /* last deauth reason */
++ u_int32_t ns_tx_disassoc; /* disassociations */
++ u_int32_t ns_tx_disassoc_code; /* last disassociation reason */
++ u_int32_t ns_psq_drops; /* power save queue drops */
++};
++
++/*
++ * Summary statistics.
++ */
++struct ieee80211_stats {
++ u_int32_t is_rx_badversion; /* rx frame with bad version */
++ u_int32_t is_rx_tooshort; /* rx frame too short */
++ u_int32_t is_rx_wrongbss; /* rx from wrong bssid */
++ u_int32_t is_rx_dup; /* rx discard due to it's a dup */
++ u_int32_t is_rx_wrongdir; /* rx w/ wrong direction */
++ u_int32_t is_rx_mcastecho; /* rx discard due to of mcast echo */
++ u_int32_t is_rx_notassoc; /* rx discard due to sta !assoc */
++ u_int32_t is_rx_noprivacy; /* rx w/ wep but privacy off */
++ u_int32_t is_rx_unencrypted; /* rx w/o wep and privacy on */
++ u_int32_t is_rx_wepfail; /* rx wep processing failed */
++ u_int32_t is_rx_decap; /* rx decapsulation failed */
++ u_int32_t is_rx_mgtdiscard; /* rx discard mgt frames */
++ u_int32_t is_rx_ctl; /* rx discard ctrl frames */
++ u_int32_t is_rx_beacon; /* rx beacon frames */
++ u_int32_t is_rx_rstoobig; /* rx rate set truncated */
++ u_int32_t is_rx_elem_missing; /* rx required element missing*/
++ u_int32_t is_rx_elem_toobig; /* rx element too big */
++ u_int32_t is_rx_elem_toosmall; /* rx element too small */
++ u_int32_t is_rx_elem_unknown; /* rx element unknown */
++ u_int32_t is_rx_badchan; /* rx frame w/ invalid chan */
++ u_int32_t is_rx_chanmismatch; /* rx frame chan mismatch */
++ u_int32_t is_rx_nodealloc; /* rx frame dropped */
++ u_int32_t is_rx_ssidmismatch; /* rx frame ssid mismatch */
++ u_int32_t is_rx_auth_unsupported;/* rx w/ unsupported auth alg */
++ u_int32_t is_rx_auth_fail; /* rx sta auth failure */
++ u_int32_t is_rx_auth_countermeasures;/* rx auth discard due to CM */
++ u_int32_t is_rx_assoc_bss; /* rx assoc from wrong bssid */
++ u_int32_t is_rx_assoc_notauth; /* rx assoc w/o auth */
++ u_int32_t is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
++ u_int32_t is_rx_assoc_norate; /* rx assoc w/ no rate match */
++ u_int32_t is_rx_assoc_badwpaie; /* rx assoc w/ bad WPA IE */
++ u_int32_t is_rx_deauth; /* rx deauthentication */
++ u_int32_t is_rx_disassoc; /* rx disassociation */
++ u_int32_t is_rx_badsubtype; /* rx frame w/ unknown subtype*/
++ u_int32_t is_rx_nobuf; /* rx failed for lack of buf */
++ u_int32_t is_rx_decryptcrc; /* rx decrypt failed on crc */
++ u_int32_t is_rx_ahdemo_mgt; /* rx discard ahdemo mgt frame*/
++ u_int32_t is_rx_bad_auth; /* rx bad auth request */
++ u_int32_t is_rx_unauth; /* rx on unauthorized port */
++ u_int32_t is_rx_badkeyid; /* rx w/ incorrect keyid */
++ u_int32_t is_rx_ccmpreplay; /* rx seq# violation (CCMP) */
++ u_int32_t is_rx_ccmpformat; /* rx format bad (CCMP) */
++ u_int32_t is_rx_ccmpmic; /* rx MIC check failed (CCMP) */
++ u_int32_t is_rx_tkipreplay; /* rx seq# violation (TKIP) */
++ u_int32_t is_rx_tkipformat; /* rx format bad (TKIP) */
++ u_int32_t is_rx_tkipmic; /* rx MIC check failed (TKIP) */
++ u_int32_t is_rx_tkipicv; /* rx ICV check failed (TKIP) */
++ u_int32_t is_rx_badcipher; /* rx failed due to of key type */
++ u_int32_t is_rx_nocipherctx; /* rx failed due to key !setup */
++ u_int32_t is_rx_acl; /* rx discard due to of acl policy */
++ u_int32_t is_rx_ffcnt; /* rx fast frames */
++ u_int32_t is_rx_badathtnl; /* driver key alloc failed */
++ u_int32_t is_tx_nobuf; /* tx failed for lack of buf */
++ u_int32_t is_tx_nonode; /* tx failed for no node */
++ u_int32_t is_tx_unknownmgt; /* tx of unknown mgt frame */
++ u_int32_t is_tx_badcipher; /* tx failed due to of key type */
++ u_int32_t is_tx_nodefkey; /* tx failed due to no defkey */
++ u_int32_t is_tx_noheadroom; /* tx failed due to no space */
++ u_int32_t is_tx_ffokcnt; /* tx fast frames sent success */
++ u_int32_t is_tx_fferrcnt; /* tx fast frames sent success */
++ u_int32_t is_scan_active; /* active scans started */
++ u_int32_t is_scan_passive; /* passive scans started */
++ u_int32_t is_node_timeout; /* nodes timed out inactivity */
++ u_int32_t is_crypto_nomem; /* no memory for crypto ctx */
++ u_int32_t is_crypto_tkip; /* tkip crypto done in s/w */
++ u_int32_t is_crypto_tkipenmic; /* tkip en-MIC done in s/w */
++ u_int32_t is_crypto_tkipdemic; /* tkip de-MIC done in s/w */
++ u_int32_t is_crypto_tkipcm; /* tkip counter measures */
++ u_int32_t is_crypto_ccmp; /* ccmp crypto done in s/w */
++ u_int32_t is_crypto_wep; /* wep crypto done in s/w */
++ u_int32_t is_crypto_setkey_cipher;/* cipher rejected key */
++ u_int32_t is_crypto_setkey_nokey;/* no key index for setkey */
++ u_int32_t is_crypto_delkey; /* driver key delete failed */
++ u_int32_t is_crypto_badcipher; /* unknown cipher */
++ u_int32_t is_crypto_nocipher; /* cipher not available */
++ u_int32_t is_crypto_attachfail; /* cipher attach failed */
++ u_int32_t is_crypto_swfallback; /* cipher fallback to s/w */
++ u_int32_t is_crypto_keyfail; /* driver key alloc failed */
++ u_int32_t is_crypto_enmicfail; /* en-MIC failed */
++ u_int32_t is_ibss_capmismatch; /* merge failed-cap mismatch */
++ u_int32_t is_ibss_norate; /* merge failed-rate mismatch */
++ u_int32_t is_ps_unassoc; /* ps-poll for unassoc. sta */
++ u_int32_t is_ps_badaid; /* ps-poll w/ incorrect aid */
++ u_int32_t is_ps_qempty; /* ps-poll w/ nothing to send */
++};
++
++/*
++ * Max size of optional information elements. We artificially
++ * constrain this; it's limited only by the max frame size (and
++ * the max parameter size of the wireless extensions).
++ */
++#define IEEE80211_MAX_OPT_IE 256
++
++/*
++ * WPA/RSN get/set key request. Specify the key/cipher
++ * type and whether the key is to be used for sending and/or
++ * receiving. The key index should be set only when working
++ * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
++ * Otherwise a unicast/pairwise key is specified by the bssid
++ * (on a station) or mac address (on an ap). They key length
++ * must include any MIC key data; otherwise it should be no
++ more than IEEE80211_KEYBUF_SIZE.
++ */
++struct ieee80211req_key {
++ u_int8_t ik_type; /* key/cipher type */
++ u_int8_t ik_pad;
++ ieee80211_keyix_t ik_keyix; /* key index */
++ u_int8_t ik_keylen; /* key length in bytes */
++ u_int8_t ik_flags;
++/* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */
++#define IEEE80211_KEY_DEFAULT 0x80 /* default xmit key */
++ 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];
++};
++
++/*
++ * Delete a key either by index or address. Set the index
++ * to IEEE80211_KEYIX_NONE when deleting a unicast key.
++ */
++struct ieee80211req_del_key {
++ /* XXX: This should be ieee80211_keyix_t, but it changes API/ABI for hostapd */
++ u_int8_t idk_keyix; /* key index */
++ u_int8_t idk_macaddr[IEEE80211_ADDR_LEN];
++};
++
++/*
++ * MLME state manipulation request. IEEE80211_MLME_ASSOC
++ * only makes sense when operating as a station. The other
++ * requests can be used when operating as a station or an
++ * ap (to effect a station).
++ */
++struct ieee80211req_mlme {
++ u_int8_t im_op; /* operation to perform */
++#define IEEE80211_MLME_ASSOC 1 /* associate station */
++#define IEEE80211_MLME_DISASSOC 2 /* disassociate station */
++#define IEEE80211_MLME_DEAUTH 3 /* deauthenticate station */
++#define IEEE80211_MLME_AUTHORIZE 4 /* authorize station */
++#define IEEE80211_MLME_UNAUTHORIZE 5 /* unauthorize station */
++#define IEEE80211_MLME_CLEAR_STATS 6 /* clear station statistic */
++ u_int8_t im_ssid_len; /* length of optional ssid */
++ u_int16_t im_reason; /* 802.11 reason code */
++ u_int8_t im_macaddr[IEEE80211_ADDR_LEN];
++ u_int8_t im_ssid[IEEE80211_NWID_LEN];
++};
++
++/*
++ * MAC ACL operations.
++ */
++enum {
++ IEEE80211_MACCMD_POLICY_OPEN = 0, /* set policy: no ACL's */
++ IEEE80211_MACCMD_POLICY_ALLOW = 1, /* set policy: allow traffic */
++ IEEE80211_MACCMD_POLICY_DENY = 2, /* set policy: deny traffic */
++ IEEE80211_MACCMD_FLUSH = 3, /* flush ACL database */
++ IEEE80211_MACCMD_DETACH = 4, /* detach ACL policy */
++};
++
++/*
++ * Set the active channel list. Note this list is
++ * intersected with the available channel list in
++ * calculating the set of channels actually used in
++ * scanning.
++ */
++struct ieee80211req_chanlist {
++ u_int8_t ic_channels[IEEE80211_CHAN_BYTES];
++};
++
++/*
++ * Get the active channel list info.
++ */
++struct ieee80211req_chaninfo {
++ u_int ic_nchans;
++ struct ieee80211_channel ic_chans[IEEE80211_CHAN_MAX];
++};
++
++/*
++ * Retrieve the WPA/RSN information element for an associated station.
++ */
++struct ieee80211req_wpaie {
++ u_int8_t wpa_macaddr[IEEE80211_ADDR_LEN];
++ u_int8_t wpa_ie[IEEE80211_MAX_OPT_IE];
++ u_int8_t rsn_ie[IEEE80211_MAX_OPT_IE];
++};
++
++/*
++ * Retrieve per-node statistics.
++ */
++struct ieee80211req_sta_stats {
++ union {
++ /* NB: explicitly force 64-bit alignment */
++ u_int8_t macaddr[IEEE80211_ADDR_LEN];
++ u_int64_t pad;
++ } is_u;
++ struct ieee80211_nodestats is_stats;
++};
++
++/*
++ * Station information block; the mac address is used
++ * to retrieve other data like stats, unicast key, etc.
++ */
++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;
++ 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 */
++
++ /* XXX frag state? */
++ /* variable length IE data */
++};
++
++enum {
++ IEEE80211_STA_OPMODE_NORMAL,
++ IEEE80211_STA_OPMODE_XR
++};
++
++/*
++ * Retrieve per-station information; to retrieve all
++ * specify a mac address of ff:ff:ff:ff:ff:ff.
++ */
++struct ieee80211req_sta_req {
++ union {
++ /* NB: explicitly force 64-bit alignment */
++ u_int8_t macaddr[IEEE80211_ADDR_LEN];
++ u_int64_t pad;
++ } is_u;
++ struct ieee80211req_sta_info info[1]; /* variable length */
++};
++
++/*
++ * Get/set per-station tx power cap.
++ */
++struct ieee80211req_sta_txpow {
++ u_int8_t it_macaddr[IEEE80211_ADDR_LEN];
++ u_int8_t it_txpow;
++};
++
++/*
++ * WME parameters are set and return using i_val and i_len.
++ * i_val holds the value itself. i_len specifies the AC
++ * and, as appropriate, then high bit specifies whether the
++ * operation is to be applied to the BSS or ourself.
++ */
++#define IEEE80211_WMEPARAM_SELF 0x0000 /* parameter applies to self */
++#define IEEE80211_WMEPARAM_BSS 0x8000 /* parameter applies to BSS */
++#define IEEE80211_WMEPARAM_VAL 0x7fff /* parameter value */
++
++/*
++ * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
++ */
++struct ieee80211req_scan_result {
++ u_int16_t isr_len; /* length (mult of 4) */
++ u_int16_t isr_freq; /* MHz */
++ u_int16_t isr_flags; /* channel flags */
++ u_int8_t isr_noise;
++ u_int8_t isr_rssi;
++ u_int8_t isr_intval; /* beacon interval */
++ u_int16_t isr_capinfo; /* capabilities */
++ u_int8_t isr_erp; /* ERP element */
++ u_int8_t isr_bssid[IEEE80211_ADDR_LEN];
++ u_int8_t isr_nrates;
++ u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE];
++ u_int8_t isr_ssid_len; /* SSID length */
++ u_int8_t isr_ie_len; /* IE length */
++ u_int8_t isr_pad[5];
++ /* variable length SSID followed by IE data */
++};
++
++#ifdef __FreeBSD__
++/*
++ * FreeBSD-style ioctls.
++ */
++/* the first member must be matched with struct ifreq */
++struct ieee80211req {
++ char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */
++ u_int16_t i_type; /* req type */
++ int16_t i_val; /* Index or simple value */
++ int16_t i_len; /* Index or simple value */
++ void *i_data; /* Extra data */
++};
++#define SIOCS80211 _IOW('i', 234, struct ieee80211req)
++#define SIOCG80211 _IOWR('i', 235, struct ieee80211req)
++#define SIOCG80211STATS _IOWR('i', 236, struct ifreq)
++#define SIOC80211IFCREATE _IOWR('i', 237, struct ifreq)
++#define SIOC80211IFDESTROY _IOW('i', 238, struct ifreq)
++
++#define IEEE80211_IOC_SSID 1
++#define IEEE80211_IOC_NUMSSIDS 2
++#define IEEE80211_IOC_WEP 3
++#define IEEE80211_WEP_NOSUP -1
++#define IEEE80211_WEP_OFF 0
++#define IEEE80211_WEP_ON 1
++#define IEEE80211_WEP_MIXED 2
++#define IEEE80211_IOC_WEPKEY 4
++#define IEEE80211_IOC_NUMWEPKEYS 5
++#define IEEE80211_IOC_WEPTXKEY 6
++#define IEEE80211_IOC_AUTHMODE 7
++#define IEEE80211_IOC_STATIONNAME 8
++#define IEEE80211_IOC_CHANNEL 9
++#define IEEE80211_IOC_POWERSAVE 10
++#define IEEE80211_POWERSAVE_NOSUP -1
++#define IEEE80211_POWERSAVE_OFF 0
++#define IEEE80211_POWERSAVE_CAM 1
++#define IEEE80211_POWERSAVE_PSP 2
++#define IEEE80211_POWERSAVE_PSP_CAM 3
++#define IEEE80211_POWERSAVE_ON IEEE80211_POWERSAVE_CAM
++#define IEEE80211_IOC_POWERSAVESLEEP 11
++#define IEEE80211_IOC_RTSTHRESHOLD 12
++#define IEEE80211_IOC_PROTMODE 13
++#define IEEE80211_PROTMODE_OFF 0
++#define IEEE80211_PROTMODE_CTS 1
++#define IEEE80211_PROTMODE_RTSCTS 2
++#define IEEE80211_IOC_TXPOWER 14 /* global tx power limit */
++#define IEEE80211_IOC_BSSID 15
++#define IEEE80211_IOC_ROAMING 16 /* roaming mode */
++#define IEEE80211_IOC_PRIVACY 17 /* privacy invoked */
++#define IEEE80211_IOC_DROPUNENCRYPTED 18 /* discard unencrypted frames */
++#define IEEE80211_IOC_WPAKEY 19
++#define IEEE80211_IOC_DELKEY 20
++#define IEEE80211_IOC_MLME 21
++#define IEEE80211_IOC_OPTIE 22 /* optional info. element */
++#define IEEE80211_IOC_SCAN_REQ 23
++#define IEEE80211_IOC_SCAN_RESULTS 24
++#define IEEE80211_IOC_COUNTERMEASURES 25 /* WPA/TKIP countermeasures */
++#define IEEE80211_IOC_WPA 26 /* WPA mode (0,1,2) */
++#define IEEE80211_IOC_CHANLIST 27 /* channel list */
++#define IEEE80211_IOC_WME 28 /* WME mode (on, off) */
++#define IEEE80211_IOC_HIDESSID 29 /* hide SSID mode (on, off) */
++#define IEEE80211_IOC_APBRIDGE 30 /* AP inter-sta bridging */
++#define IEEE80211_IOC_MCASTCIPHER 31 /* multicast/default cipher */
++#define IEEE80211_IOC_MCASTKEYLEN 32 /* multicast key length */
++#define IEEE80211_IOC_UCASTCIPHERS 33 /* unicast cipher suites */
++#define IEEE80211_IOC_UCASTCIPHER 34 /* unicast cipher */
++#define IEEE80211_IOC_UCASTKEYLEN 35 /* unicast key length */
++#define IEEE80211_IOC_DRIVER_CAPS 36 /* driver capabilities */
++#define IEEE80211_IOC_KEYMGTALGS 37 /* key management algorithms */
++#define IEEE80211_IOC_RSNCAPS 38 /* RSN capabilities */
++#define IEEE80211_IOC_WPAIE 39 /* WPA information element */
++#define IEEE80211_IOC_STA_STATS 40 /* per-station statistics */
++#define IEEE80211_IOC_MACCMD 41 /* MAC ACL operation */
++#define IEEE80211_IOC_TXPOWMAX 43 /* max tx power for channel */
++#define IEEE80211_IOC_STA_TXPOW 44 /* per-station tx power limit */
++#define IEEE80211_IOC_STA_INFO 45 /* station/neighbor info */
++#define IEEE80211_IOC_WME_CWMIN 46 /* WME: ECWmin */
++#define IEEE80211_IOC_WME_CWMAX 47 /* WME: ECWmax */
++#define IEEE80211_IOC_WME_AIFS 48 /* WME: AIFSN */
++#define IEEE80211_IOC_WME_TXOPLIMIT 49 /* WME: txops limit */
++#define IEEE80211_IOC_WME_ACM 50 /* WME: ACM (bss only) */
++#define IEEE80211_IOC_WME_ACKPOLICY 51 /* WME: ACK policy (!bss only)*/
++#define IEEE80211_IOC_DTIM_PERIOD 52 /* DTIM period (beacons) */
++#define IEEE80211_IOC_BEACON_INTERVAL 53 /* beacon interval (ms) */
++#define IEEE80211_IOC_ADDMAC 54 /* add sta to MAC ACL table */
++#define IEEE80211_IOC_DELMAC 55 /* del sta from MAC ACL table */
++#define IEEE80211_IOC_FF 56 /* ATH fast frames (on, off) */
++#define IEEE80211_IOC_TURBOP 57 /* ATH turbo' (on, off) */
++#define IEEE80211_IOC_APPIEBUF 58 /* IE in the management frame */
++#define IEEE80211_IOC_FILTERFRAME 59 /* management frame filter */
++
++/*
++ * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
++ */
++struct ieee80211req_scan_result {
++ u_int16_t isr_len; /* length (mult of 4) */
++ u_int16_t isr_freq; /* MHz */
++ u_int16_t isr_flags; /* channel flags */
++ u_int8_t isr_noise;
++ u_int8_t isr_rssi;
++ u_int8_t isr_intval; /* beacon interval */
++ u_int16_t isr_capinfo; /* capabilities */
++ u_int8_t isr_erp; /* ERP element */
++ u_int8_t isr_bssid[IEEE80211_ADDR_LEN];
++ u_int8_t isr_nrates;
++ u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE];
++ u_int8_t isr_ssid_len; /* SSID length */
++ u_int8_t isr_ie_len; /* IE length */
++ u_int8_t isr_pad[5];
++ /* variable length SSID followed by IE data */
++};
++
++#endif /* __FreeBSD__ */
++
++#ifdef __linux__
++/*
++ * Wireless Extensions API, private ioctl interfaces.
++ *
++ * NB: Even-numbered ioctl numbers have set semantics and are privileged!
++ * (regardless of the incorrect comment in wireless.h!)
++ */
++#ifdef __KERNEL__
++#include <linux/if.h>
++#endif
++#define IEEE80211_IOCTL_SETPARAM (SIOCIWFIRSTPRIV+0)
++#define IEEE80211_IOCTL_GETPARAM (SIOCIWFIRSTPRIV+1)
++#define IEEE80211_IOCTL_SETMODE (SIOCIWFIRSTPRIV+2)
++#define IEEE80211_IOCTL_GETMODE (SIOCIWFIRSTPRIV+3)
++#define IEEE80211_IOCTL_SETWMMPARAMS (SIOCIWFIRSTPRIV+4)
++#define IEEE80211_IOCTL_GETWMMPARAMS (SIOCIWFIRSTPRIV+5)
++#define IEEE80211_IOCTL_SETCHANLIST (SIOCIWFIRSTPRIV+6)
++#define IEEE80211_IOCTL_GETCHANLIST (SIOCIWFIRSTPRIV+7)
++#define IEEE80211_IOCTL_CHANSWITCH (SIOCIWFIRSTPRIV+8)
++#define IEEE80211_IOCTL_GET_APPIEBUF (SIOCIWFIRSTPRIV+9)
++#define IEEE80211_IOCTL_SET_APPIEBUF (SIOCIWFIRSTPRIV+10)
++#define IEEE80211_IOCTL_READREG (SIOCIWFIRSTPRIV+11)
++#define IEEE80211_IOCTL_FILTERFRAME (SIOCIWFIRSTPRIV+12)
++#define IEEE80211_IOCTL_GETCHANINFO (SIOCIWFIRSTPRIV+13)
++#define IEEE80211_IOCTL_SETOPTIE (SIOCIWFIRSTPRIV+14)
++#define IEEE80211_IOCTL_GETOPTIE (SIOCIWFIRSTPRIV+15)
++#define IEEE80211_IOCTL_SETMLME (SIOCIWFIRSTPRIV+16)
++#define IEEE80211_IOCTL_SETKEY (SIOCIWFIRSTPRIV+18)
++#define IEEE80211_IOCTL_WRITEREG (SIOCIWFIRSTPRIV+19)
++#define IEEE80211_IOCTL_DELKEY (SIOCIWFIRSTPRIV+20)
++#define IEEE80211_IOCTL_ADDMAC (SIOCIWFIRSTPRIV+22)
++#define IEEE80211_IOCTL_DELMAC (SIOCIWFIRSTPRIV+24)
++#define IEEE80211_IOCTL_WDSADDMAC (SIOCIWFIRSTPRIV+26)
++#define IEEE80211_IOCTL_WDSDELMAC (SIOCIWFIRSTPRIV+28)
++#define IEEE80211_IOCTL_KICKMAC (SIOCIWFIRSTPRIV+30)
++
++enum {
++ IEEE80211_WMMPARAMS_CWMIN = 1,
++ IEEE80211_WMMPARAMS_CWMAX = 2,
++ IEEE80211_WMMPARAMS_AIFS = 3,
++ IEEE80211_WMMPARAMS_TXOPLIMIT = 4,
++ IEEE80211_WMMPARAMS_ACM = 5,
++ IEEE80211_WMMPARAMS_NOACKPOLICY = 6,
++};
++enum {
++ IEEE80211_PARAM_TURBO = 1, /* turbo mode */
++ IEEE80211_PARAM_MODE = 2, /* phy mode (11a, 11b, etc.) */
++ IEEE80211_PARAM_AUTHMODE = 3, /* authentication mode */
++ IEEE80211_PARAM_PROTMODE = 4, /* 802.11g protection */
++ IEEE80211_PARAM_MCASTCIPHER = 5, /* multicast/default cipher */
++ IEEE80211_PARAM_MCASTKEYLEN = 6, /* multicast key length */
++ IEEE80211_PARAM_UCASTCIPHERS = 7, /* unicast cipher suites */
++ IEEE80211_PARAM_UCASTCIPHER = 8, /* unicast cipher */
++ IEEE80211_PARAM_UCASTKEYLEN = 9, /* unicast key length */
++ IEEE80211_PARAM_WPA = 10, /* WPA mode (0,1,2) */
++ IEEE80211_PARAM_ROAMING = 12, /* roaming mode */
++ IEEE80211_PARAM_PRIVACY = 13, /* privacy invoked */
++ IEEE80211_PARAM_COUNTERMEASURES = 14, /* WPA/TKIP countermeasures */
++ IEEE80211_PARAM_DROPUNENCRYPTED = 15, /* discard unencrypted frames */
++ IEEE80211_PARAM_DRIVER_CAPS = 16, /* driver capabilities */
++ IEEE80211_PARAM_MACCMD = 17, /* MAC ACL operation */
++ IEEE80211_PARAM_WMM = 18, /* WMM mode (on, off) */
++ IEEE80211_PARAM_HIDESSID = 19, /* hide SSID mode (on, off) */
++ IEEE80211_PARAM_APBRIDGE = 20, /* AP inter-sta bridging */
++ IEEE80211_PARAM_KEYMGTALGS = 21, /* key management algorithms */
++ IEEE80211_PARAM_RSNCAPS = 22, /* RSN capabilities */
++ IEEE80211_PARAM_INACT = 23, /* station inactivity timeout */
++ IEEE80211_PARAM_INACT_AUTH = 24, /* station auth inact timeout */
++ IEEE80211_PARAM_INACT_INIT = 25, /* station init inact timeout */
++ IEEE80211_PARAM_ABOLT = 26, /* Atheros Adv. Capabilities */
++ IEEE80211_PARAM_DTIM_PERIOD = 28, /* DTIM period (beacons) */
++ IEEE80211_PARAM_BEACON_INTERVAL = 29, /* beacon interval (ms) */
++ IEEE80211_PARAM_DOTH = 30, /* 11.h is on/off */
++ IEEE80211_PARAM_PWRTARGET = 31, /* Current Channel Pwr Constraint */
++ IEEE80211_PARAM_GENREASSOC = 32, /* Generate a reassociation request */
++ IEEE80211_PARAM_COMPRESSION = 33, /* compression */
++ IEEE80211_PARAM_FF = 34, /* fast frames support */
++ IEEE80211_PARAM_XR = 35, /* XR support */
++ IEEE80211_PARAM_BURST = 36, /* burst mode */
++ IEEE80211_PARAM_PUREG = 37, /* pure 11g (no 11b stations) */
++ IEEE80211_PARAM_AR = 38, /* AR support */
++ IEEE80211_PARAM_WDS = 39, /* Enable 4 address processing */
++ IEEE80211_PARAM_BGSCAN = 40, /* bg scanning (on, off) */
++ IEEE80211_PARAM_BGSCAN_IDLE = 41, /* bg scan idle threshold */
++ IEEE80211_PARAM_BGSCAN_INTERVAL = 42, /* bg scan interval */
++ IEEE80211_PARAM_MCAST_RATE = 43, /* Multicast Tx Rate */
++ IEEE80211_PARAM_COVERAGE_CLASS = 44, /* coverage class */
++ IEEE80211_PARAM_COUNTRY_IE = 45, /* enable country IE */
++ IEEE80211_PARAM_SCANVALID = 46, /* scan cache valid threshold */
++ IEEE80211_PARAM_ROAM_RSSI_11A = 47, /* rssi threshold in 11a */
++ IEEE80211_PARAM_ROAM_RSSI_11B = 48, /* rssi threshold in 11b */
++ IEEE80211_PARAM_ROAM_RSSI_11G = 49, /* rssi threshold in 11g */
++ IEEE80211_PARAM_ROAM_RATE_11A = 50, /* tx rate threshold in 11a */
++ IEEE80211_PARAM_ROAM_RATE_11B = 51, /* tx rate threshold in 11b */
++ IEEE80211_PARAM_ROAM_RATE_11G = 52, /* tx rate threshold in 11g */
++ IEEE80211_PARAM_UAPSDINFO = 53, /* value for qos info field */
++ IEEE80211_PARAM_SLEEP = 54, /* force sleep/wake */
++ IEEE80211_PARAM_QOSNULL = 55, /* force sleep/wake */
++ IEEE80211_PARAM_PSPOLL = 56, /* force ps-poll generation (sta only) */
++ IEEE80211_PARAM_EOSPDROP = 57, /* force uapsd EOSP drop (ap only) */
++ IEEE80211_PARAM_MARKDFS = 58, /* mark a dfs interference channel when found */
++ IEEE80211_PARAM_REGCLASS = 59, /* enable regclass ids in country IE */
++ IEEE80211_PARAM_DROPUNENC_EAPOL = 60, /* drop unencrypted eapol frames */
++ IEEE80211_PARAM_SHPREAMBLE = 61, /* Short Preamble */
++ IEEE80211_PARAM_DUMPREGS = 62, /* Pretty printed dump of Atheros hardware registers */
++};
++
++#define SIOCG80211STATS (SIOCDEVPRIVATE+2)
++/* NB: require in+out parameters so cannot use wireless extensions, yech */
++#define IEEE80211_IOCTL_GETKEY (SIOCDEVPRIVATE+3)
++#define IEEE80211_IOCTL_GETWPAIE (SIOCDEVPRIVATE+4)
++#define IEEE80211_IOCTL_STA_STATS (SIOCDEVPRIVATE+5)
++#define IEEE80211_IOCTL_STA_INFO (SIOCDEVPRIVATE+6)
++#define SIOC80211IFCREATE (SIOCDEVPRIVATE+7)
++#define SIOC80211IFDESTROY (SIOCDEVPRIVATE+8)
++#define IEEE80211_IOCTL_SCAN_RESULTS (SIOCDEVPRIVATE+9)
++
++struct ieee80211_clone_params {
++ char icp_name[IFNAMSIZ]; /* device name */
++ u_int16_t icp_opmode; /* operating mode */
++ u_int16_t icp_flags; /* see below */
++#define IEEE80211_CLONE_BSSID 0x0001 /* allocate unique mac/bssid */
++#define IEEE80211_NO_STABEACONS 0x0002 /* Do not setup the station beacon timers */
++};
++
++/* APPIEBUF related definitions */
++
++/* Management frame type to which application IE is added */
++enum {
++ IEEE80211_APPIE_FRAME_BEACON = 0,
++ IEEE80211_APPIE_FRAME_PROBE_REQ = 1,
++ IEEE80211_APPIE_FRAME_PROBE_RESP = 2,
++ IEEE80211_APPIE_FRAME_ASSOC_REQ = 3,
++ IEEE80211_APPIE_FRAME_ASSOC_RESP = 4,
++ IEEE80211_APPIE_NUM_OF_FRAME = 5
++};
++
++struct ieee80211req_getset_appiebuf {
++ u_int32_t app_frmtype; /* management frame type for which buffer is added */
++ u_int32_t app_buflen; /* application-supplied buffer length */
++ u_int8_t app_buf[0]; /* application-supplied IE(s) */
++};
++
++/* Flags ORed by application to set filter for receiving management frames */
++enum {
++ IEEE80211_FILTER_TYPE_BEACON = 1<<0,
++ IEEE80211_FILTER_TYPE_PROBE_REQ = 1<<1,
++ IEEE80211_FILTER_TYPE_PROBE_RESP = 1<<2,
++ IEEE80211_FILTER_TYPE_ASSOC_REQ = 1<<3,
++ IEEE80211_FILTER_TYPE_ASSOC_RESP = 1<<4,
++ IEEE80211_FILTER_TYPE_AUTH = 1<<5,
++ IEEE80211_FILTER_TYPE_DEAUTH = 1<<6,
++ IEEE80211_FILTER_TYPE_DISASSOC = 1<<7,
++ IEEE80211_FILTER_TYPE_ALL = 0xFF /* used to check the valid filter bits */
++};
++
++struct ieee80211req_set_filter {
++ u_int32_t app_filterype; /* management frame filter type */
++};
++
++
++#endif /* __linux__ */
++
++#endif /* _NET80211_IEEE80211_IOCTL_H_ */
Added: wpasupplicant/trunk/debian/patches/21_config_driver_madwifi.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/21_config_driver_madwifi.patch?rev=919&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/21_config_driver_madwifi.patch (added)
+++ wpasupplicant/trunk/debian/patches/21_config_driver_madwifi.patch Tue Dec 25 14:56:52 2007
@@ -1,0 +1,14 @@
+--- a/wpa_supplicant/.config
++++ b/wpa_supplicant/.config
+@@ -10,9 +10,9 @@
+ #CFLAGS += -I../../include/wireless
+
+ # Driver interface for madwifi driver
+-#CONFIG_DRIVER_MADWIFI=y
++CONFIG_DRIVER_MADWIFI=y
+ # Change include directories to match with the local setup
+-#CFLAGS += -I../madwifi/wpa
++CFLAGS += -I../src/drivers/driver_madwifi/
+
+ # Driver interface for Prism54 driver
+ # (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
Added: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=919&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (added)
+++ wpasupplicant/trunk/debian/patches/series Tue Dec 25 14:56:52 2007
@@ -1,0 +1,4 @@
+01_defconfig.patch
+10_dbus_group_policy.patch
+20_madwifi_headers.patch
+21_config_driver_madwifi.patch
Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=919&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Tue Dec 25 14:56:52 2007
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
QMAKE=qmake-qt4
WPAGUI=wpa_gui
@@ -19,12 +19,11 @@
INSTALL_PROGRAM += -s
endif
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
# wpa_supplicant
- sh debian/defconfig.sh wpa_supplicant/.config
$(MAKE) -C wpa_supplicant
# manpages - docbook2man
@@ -54,7 +53,13 @@
rm -f wpa_supplicant/$(WPAGUI)/Makefile ; \
fi
- -rm -f wpa_supplicant/.config README.wpa_supplicant.conf
+ if [ -f README.wpa_supplicant.conf ]; then \
+ rm -f README.wpa_supplicant.conf ; \
+ fi
+
+ if [ -d src/drivers/driver_madwifi/ ]; then \
+ rm -rf src/drivers/driver_madwifi/ ; \
+ fi
dh_clean
More information about the Pkg-wpa-devel
mailing list