From 02b4f0c51b483b34b31328e6bc99af9af961d1a2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 18 Apr 2014 18:37:29 +0200 Subject: [PATCH] Update upstream modules This updates OpenWRT and rebases our patches. Furthermore, the mac80211 module is removed as currently the Attitude Adjustment main repo has a newer version (and some fixes that aren't in the backport repo). Also, update odhcp6c from Barrier Breaker. --- modules | 15 +- ...Update-odhcp6c-from-Barrier-Breaker.patch} | 129 +- ...Remove-hostapd-and-mac80211-packages.patch | 21949 ---------------- ...atest-git-add-UCI-config-path-patch.patch} | 0 ...el-support-for-the-TL-WDR3500-board.patch} | 0 ...-space-support-for-TL-WDR3500-board.patch} | 0 ...uild-image-for-the-TL-WDR3500-board.patch} | 0 ...ch-configuration-for-the-TL-WDR3500.patch} | 0 ...add-diag-support-for-the-TL-WDR3500.patch} | 0 ...ic-suffix-of-the-TL-WDR3500-USB-LED.patch} | 0 ...ix-USB-power-GPIO-on-the-TL-WDR3500.patch} | 0 ...ED-configuration-for-the-WL-WRD3500.patch} | 0 ...fix-ethernet-LEDs-on-the-TL-WDR3500.patch} | 0 ...PIO-output-select-values-for-AR934x.patch} | 0 ...80211-ath9k-add-support-for-QCA953x.patch} | 6 +- 15 files changed, 114 insertions(+), 21985 deletions(-) rename patches/openwrt/{0003-Update-odhcp6c-to-latest-git-master.patch => 0003-Update-odhcp6c-from-Barrier-Breaker.patch} (50%) delete mode 100644 patches/openwrt/0006-Remove-hostapd-and-mac80211-packages.patch rename patches/openwrt/{0007-netifd-update-to-latest-git-add-UCI-config-path-patch.patch => 0006-netifd-update-to-latest-git-add-UCI-config-path-patch.patch} (100%) rename patches/openwrt/{0008-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch => 0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch} (100%) rename patches/openwrt/{0009-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch => 0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch} (100%) rename patches/openwrt/{0010-ar71xx-build-image-for-the-TL-WDR3500-board.patch => 0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch} (100%) rename patches/openwrt/{0011-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch => 0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch} (100%) rename patches/openwrt/{0012-ar71xx-add-diag-support-for-the-TL-WDR3500.patch => 0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch} (100%) rename patches/openwrt/{0013-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch => 0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch} (100%) rename patches/openwrt/{0014-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch => 0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch} (100%) rename patches/openwrt/{0015-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch => 0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch} (100%) rename patches/openwrt/{0016-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch => 0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch} (100%) rename patches/openwrt/{0017-ar71xx-add-GPIO-output-select-values-for-AR934x.patch => 0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch} (100%) rename patches/{packages/mac80211/0001-mac80211-ath9k-add-support-for-QCA953x.patch => openwrt/0017-mac80211-ath9k-add-support-for-QCA953x.patch} (95%) diff --git a/modules b/modules index 940f7d76..174a6a9c 100644 --- a/modules +++ b/modules @@ -1,16 +1,13 @@ -GLUON_FEEDS='openwrt mac80211 gluon routing luci' +GLUON_FEEDS='openwrt gluon routing luci' -OPENWRT_REPO=git://nbd.name/attitude_adjustment.git -OPENWRT_COMMIT=c00de5a631d0a60b8264e1f97049149cbd100cd8 +OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git +OPENWRT_COMMIT=bccb82223911823bf4ab040997757708b002a75f -PACKAGES_OPENWRT_REPO=git://nbd.name/packages_12.09.git -PACKAGES_OPENWRT_COMMIT=c67cd451ac28058a4992ba9eb2eb5551f6cd1adb - -PACKAGES_MAC80211_REPO=git://nbd.name/aa-mac80211.git -PACKAGES_MAC80211_COMMIT=a92ce773680046eeb755f6b7c7af41fb6bdd7342 +PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git +PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git -PACKAGES_GLUON_COMMIT=c7911677c381b325cc49d23ce03a14b4297b463d +PACKAGES_GLUON_COMMIT=2ced9d31f75624a7b02067e167cb34d77c4f9eb8 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 diff --git a/patches/openwrt/0003-Update-odhcp6c-to-latest-git-master.patch b/patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch similarity index 50% rename from patches/openwrt/0003-Update-odhcp6c-to-latest-git-master.patch rename to patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch index 8361b3a1..906a0b86 100644 --- a/patches/openwrt/0003-Update-odhcp6c-to-latest-git-master.patch +++ b/patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch @@ -1,9 +1,9 @@ From: Matthias Schiffer Date: Sat, 11 Jan 2014 11:47:58 +0100 -Subject: Update odhcp6c to latest git master +Subject: Update odhcp6c from Barrier Breaker diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile -index e37b72e..ed51b98 100644 +index e767064..f18e7fa 100644 --- a/package/odhcp6c/Makefile +++ b/package/odhcp6c/Makefile @@ -8,26 +8,37 @@ @@ -11,15 +11,16 @@ index e37b72e..ed51b98 100644 PKG_NAME:=odhcp6c -PKG_VERSION:=2013-10-02 -+PKG_VERSION:=2014-01-11 - PKG_RELEASE=$(PKG_SOURCE_VERSION) +-PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 ++PKG_VERSION:=2014-04-09 ++PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=357ecc1f5163bc7f74c64f4bca387e8d44a2eac5 -+PKG_SOURCE_VERSION:=8152153cb9c5b09862bf0c8a0d1005fa8dfdf262 ++PKG_SOURCE_VERSION:=6bbd2b0208fc17b6566595bfdfef2ff1d012d143 PKG_MAINTAINER:=Steven Barth include $(INCLUDE_DIR)/package.mk @@ -49,10 +50,10 @@ index e37b72e..ed51b98 100644 $(INSTALL_DIR) $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/odhcp6c $(1)/usr/sbin/ diff --git a/package/odhcp6c/files/dhcpv6.script b/package/odhcp6c/files/dhcpv6.script -index 324a823..8bcf766 100755 +index 324a823..d228014 100755 --- a/package/odhcp6c/files/dhcpv6.script +++ b/package/odhcp6c/files/dhcpv6.script -@@ -64,23 +64,28 @@ setup_interface () { +@@ -64,23 +64,34 @@ setup_interface () { entry="${entry#*,}" local metric="${entry%%,*}" @@ -61,13 +62,17 @@ index 324a823..8bcf766 100755 + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" + else + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128" -+ for prefix in $PREFIXES; do ++ for prefix in $PREFIXES $ADDRESSES; do + local paddr="${prefix%%,*}" + proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr" + done + fi done ++ proto_add_data ++ [ -n "$CER" ] && json_add_string cer "$CER" ++ proto_close_data ++ proto_send_update "$INTERFACE" if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then @@ -88,25 +93,47 @@ index 324a823..8bcf766 100755 + json_add_string proto "dslite" + json_add_string peeraddr "$AFTR_IP" + json_add_string tunlink "$INTERFACE" ++ [ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE" ++ [ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE" + json_close_object + ubus call network add_dynamic "$(json_dump)" fi # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN diff --git a/package/odhcp6c/files/dhcpv6.sh b/package/odhcp6c/files/dhcpv6.sh -index bf6cd9a..0638d28 100755 +index bf6cd9a..90a8371 100755 --- a/package/odhcp6c/files/dhcpv6.sh +++ b/package/odhcp6c/files/dhcpv6.sh -@@ -10,18 +10,20 @@ proto_dhcpv6_init_config() { - proto_config_add_string "clientid" - proto_config_add_string "reqopts" - proto_config_add_string "noslaaconly" -+ proto_config_add_string "forceprefix" - proto_config_add_string "norelease" - proto_config_add_string "ip6prefix" - proto_config_add_string "iface_dslite" - proto_config_add_string "ifaceid" -+ proto_config_add_string "sourcerouting" +@@ -5,23 +5,31 @@ + init_proto "$@" + + proto_dhcpv6_init_config() { +- proto_config_add_string "reqaddress" +- proto_config_add_string "reqprefix" +- proto_config_add_string "clientid" +- proto_config_add_string "reqopts" +- proto_config_add_string "noslaaconly" +- proto_config_add_string "norelease" +- proto_config_add_string "ip6prefix" +- proto_config_add_string "iface_dslite" +- proto_config_add_string "ifaceid" ++ renew_handler=1 ++ ++ proto_config_add_string 'reqaddress:or("try","force","none")' ++ proto_config_add_string 'reqprefix:or("auto","no",range(0, 64))' ++ proto_config_add_string clientid ++ proto_config_add_string 'reqopts:list(uinteger)' ++ proto_config_add_string 'noslaaconly:bool' ++ proto_config_add_string 'forceprefix:bool' ++ proto_config_add_string 'norelease:bool' ++ proto_config_add_string 'ip6prefix:ip6addr' ++ proto_config_add_string iface_dslite ++ proto_config_add_string zone_dslite ++ proto_config_add_string 'ifaceid:ip6addr' ++ proto_config_add_string 'sourcerouting:bool' ++ proto_config_add_string "userclass" ++ proto_config_add_string "vendorclass" ++ proto_config_add_boolean delegate } proto_dhcpv6_setup() { @@ -115,12 +142,12 @@ index bf6cd9a..0638d28 100755 - local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid -+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting -+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting ++ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite ++ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite # Configure -@@ -35,6 +37,8 @@ proto_dhcpv6_setup() { +@@ -35,16 +43,25 @@ proto_dhcpv6_setup() { [ "$noslaaconly" = "1" ] && append opts "-S" @@ -129,11 +156,65 @@ index bf6cd9a..0638d28 100755 [ "$norelease" = "1" ] && append opts "-k" [ -n "$ifaceid" ] && append opts "-i$ifaceid" -@@ -45,6 +49,7 @@ proto_dhcpv6_setup() { + ++ [ -n "$vendorclass" ] && append opts "-V$vendorclass" ++ ++ [ -n "$userclass" ] && append opts "-u$userclass" ++ + for opt in $reqopts; do + append opts "-r$opt" + done [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" -+ [ "$sourcerouting" = "1" ] && proto_export "SOURCE_ROUTING=1" ++ [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1" ++ [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0" ++ [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite" proto_export "INTERFACE=$config" proto_run_command "$config" odhcp6c \ +@@ -52,6 +69,13 @@ proto_dhcpv6_setup() { + $opts $iface + } + ++proto_dhcpv6_renew() { ++ local interface="$1" ++ # SIGUSR1 forces odhcp6c to renew its lease ++ local sigusr1="$(kill -l SIGUSR1)" ++ [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1 ++} ++ + proto_dhcpv6_teardown() { + local interface="$1" + proto_kill_command "$interface" +diff --git a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch b/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch +deleted file mode 100644 +index 292d023..0000000 +--- a/package/odhcp6c/patches/001-fix-integer-overflow-after-50-days.patch ++++ /dev/null +@@ -1,25 +0,0 @@ +-From 5b98f902f616bd9b96a2128587bc6995555a43c1 Mon Sep 17 00:00:00 2001 +-From: Steven Barth +-Date: Fri, 7 Mar 2014 10:33:49 +0100 +-Subject: [PATCH] fix integer overflow after 50 days (thx Hauke Mehrtens) +- +---- +- src/odhcp6c.c | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +-diff --git a/src/odhcp6c.c b/src/odhcp6c.c +-index 3c6b3b0..ba11ced 100644 +---- a/src/odhcp6c.c +-+++ b/src/odhcp6c.c +-@@ -470,7 +470,7 @@ uint64_t odhcp6c_get_milli_time(void) +- { +- struct timespec t = {0, 0}; +- syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t); +-- return t.tv_sec * 1000 + t.tv_nsec / 1000000; +-+ return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000; +- } +- +- +--- +-1.7.10.4 +- diff --git a/patches/openwrt/0006-Remove-hostapd-and-mac80211-packages.patch b/patches/openwrt/0006-Remove-hostapd-and-mac80211-packages.patch deleted file mode 100644 index 62637310..00000000 --- a/patches/openwrt/0006-Remove-hostapd-and-mac80211-packages.patch +++ /dev/null @@ -1,21949 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 11 Jan 2014 17:28:18 +0100 -Subject: Remove hostapd and mac80211 packages - -diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in -deleted file mode 100644 -index b39be38..0000000 ---- a/package/hostapd/Config.in -+++ /dev/null -@@ -1,47 +0,0 @@ --# wpa_supplicant config --config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK -- bool "Disable timestamp check" -- depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini -- default n -- help -- This disables the timestamp check for certificates in wpa_supplicant -- Useful for devices without RTC that cannot reliably get the real date/time -- --choice -- prompt "Choose TLS provider" -- default WPA_SUPPLICANT_INTERNAL -- depends on PACKAGE_wpa-supplicant || PACKAGE_wpad -- --config WPA_SUPPLICANT_INTERNAL -- bool "internal" -- --config WPA_SUPPLICANT_OPENSSL -- bool "openssl" -- select PACKAGE_libopenssl -- --endchoice -- --config WPA_RFKILL_SUPPORT -- bool "Add rfkill support" -- depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini -- default n -- --config WPA_MSG_MIN_PRIORITY -- int "Minimum debug message priority" -- default 3 -- help -- Useful values are: -- 0 = all messages -- 1 = raw message dumps -- 2 = most debugging messages -- 3 = info messages -- 4 = warnings -- 5 = errors -- --config DRIVER_WEXT_SUPPORT -- bool -- default n -- --config DRIVER_11N_SUPPORT -- bool -- default n -diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile -deleted file mode 100644 -index b4dc242..0000000 ---- a/package/hostapd/Makefile -+++ /dev/null -@@ -1,356 +0,0 @@ --# --# Copyright (C) 2006-2012 OpenWrt.org --# --# This is free software, licensed under the GNU General Public License v2. --# See /LICENSE for more information. --# -- --include $(TOPDIR)/rules.mk -- --PKG_NAME:=hostapd --PKG_VERSION:=20131120 --PKG_RELEASE:=1 --PKG_REV:=594516b4c28a94ca686b17f1e463dfd6712b75a7 -- --PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 --PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git --PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) --PKG_SOURCE_VERSION:=$(PKG_REV) --PKG_SOURCE_PROTO:=git --# PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a -- --PKG_MAINTAINER:=Felix Fietkau -- --PKG_BUILD_PARALLEL:=1 -- --PKG_BUILD_DEPENDS:= \ -- PACKAGE_kmod-madwifi:madwifi \ -- --PKG_CONFIG_DEPENDS:= \ -- CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \ -- CONFIG_PACKAGE_kmod-ath9k \ -- CONFIG_PACKAGE_kmod-mac80211 \ -- CONFIG_PACKAGE_kmod-madwifi \ -- CONFIG_PACKAGE_hostapd \ -- CONFIG_PACKAGE_hostapd-mini \ -- CONFIG_PACKAGE_kmod-hostap \ -- CONFIG_WPA_RFKILL_SUPPORT \ -- CONFIG_DRIVER_WEXT_SUPPORT \ -- CONFIG_DRIVER_11N_SUPPORT -- --LOCAL_TYPE=$(strip \ -- $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \ -- $(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \ -- hostapd \ -- ))) --LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT))) -- --ifeq ($(LOCAL_TYPE),supplicant) -- ifeq ($(LOCAL_VARIANT),full) -- PKG_CONFIG_DEPENDS += \ -- CONFIG_WPA_SUPPLICANT_INTERNAL \ -- CONFIG_WPA_SUPPLICANT_OPENSSL -- endif --endif -- --PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -- --include $(INCLUDE_DIR)/package.mk -- --STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY) -- --ifneq ($(CONFIG_DRIVER_11N_SUPPORT),) -- HOSTAPD_IEEE80211N:=y --endif -- --DRIVER_MAKEOPTS= \ -- CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \ -- CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \ -- CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \ -- CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \ -- CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) \ -- CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \ -- $(if $(CONFIG_WPA_RFKILL_SUPPORT),NEED_RFKILL=y) -- --ifneq ($(LOCAL_TYPE),hostapd) -- ifdef CONFIG_WPA_SUPPLICANT_OPENSSL -- ifeq ($(LOCAL_VARIANT),full) -- DRIVER_MAKEOPTS += CONFIG_TLS=openssl -- TARGET_LDFLAGS += -lcrypto -lssl -- endif -- endif -- ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK -- TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK -- endif -- DRIVER_MAKEOPTS += \ -- CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch) --endif -- --DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny @(!TARGET_avr32||BROKEN) -- --define Package/hostapd/Default -- SECTION:=net -- CATEGORY:=Network -- TITLE:=IEEE 802.1x Authenticator -- URL:=http://hostap.epitest.fi/ -- DEPENDS:=$(DRV_DEPENDS) +libubus --endef -- --define Package/hostapd --$(call Package/hostapd/Default) -- TITLE+= (full) -- VARIANT:=full --endef -- --define Package/hostapd/description -- This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS -- Authenticator. --endef -- --define Package/hostapd-mini --$(call Package/hostapd/Default) -- TITLE+= (WPA-PSK only) -- VARIANT:=mini --endef -- --define Package/hostapd-mini/description -- This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only). --endef -- --define Package/hostapd-utils -- $(call Package/hostapd/Default) -- TITLE+= (utils) -- DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini||PACKAGE_wpad||PACKAGE_wpad-mini --endef -- --define Package/hostapd-utils/description -- This package contains a command line utility to control the -- IEEE 802.1x/WPA/EAP/RADIUS Authenticator. --endef -- --define Package/wpad/Default -- SECTION:=net -- CATEGORY:=Network -- TITLE:=IEEE 802.1x Authenticator/Supplicant -- URL:=http://hostap.epitest.fi/ --endef -- --define Package/wpad --$(call Package/wpad/Default) -- TITLE+= (full) -- DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl +libubus -- VARIANT:=wpad-full --endef -- --define Package/wpad/description -- This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS -- Authenticator and Supplicant --endef -- --define Package/wpad-mini --$(call Package/wpad/Default) -- TITLE+= (WPA-PSK only) -- DEPENDS:=$(DRV_DEPENDS) +libubus -- VARIANT:=wpad-mini --endef -- --define Package/wpad-mini/description -- This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only). --endef -- --define Package/wpa-supplicant -- SECTION:=net -- CATEGORY:=Network -- TITLE:=WPA Supplicant -- URL:=http://hostap.epitest.fi/wpa_supplicant/ -- DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl -- VARIANT:=supplicant-full --endef -- --define Package/wpa-supplicant/Description -- WPA Supplicant --endef -- --define Package/wpa-supplicant/config -- source "$(SOURCE)/Config.in" --endef -- --define Package/wpa-supplicant-p2p -- $(Package/wpa-supplicant) -- TITLE:=WPA Supplicant (with Wi-Fi P2P support) -- DEPENDS:=$(DRV_DEPENDS) -- VARIANT:=supplicant-p2p --endef -- --define Package/wpa-supplicant-p2p/Description -- WPA Supplicant (with Wi-Fi P2P support) --endef -- --define Package/wpa-supplicant-mini -- $(Package/wpa-supplicant) -- TITLE:=WPA Supplicant (minimal version) -- DEPENDS:=$(DRV_DEPENDS) -- VARIANT:=supplicant-mini --endef -- --define Package/wpa-supplicant-mini/Description -- WPA Supplicant (minimal version) --endef -- --define Package/wpa-cli -- SECTION:=net -- CATEGORY:=Network -- DEPENDS:=@PACKAGE_wpa-supplicant||PACKAGE_wpa-supplicant-p2p||PACKAGE_wpad-mini||PACKAGE_wpad -- TITLE:=WPA Supplicant command line interface --endef -- --define Package/wpa-cli/Description -- WPA Supplicant control utility --endef -- --ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED))) -- define Build/Configure/rebuild -- $(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.a | $(XARGS) rm -f -- rm -f $(PKG_BUILD_DIR)/hostapd/hostapd -- rm -f $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant -- rm -f $(PKG_BUILD_DIR)/.config_* -- touch $(subst .configured_,.config_,$(STAMP_CONFIGURED)) -- endef --endif -- --define Build/Configure -- $(Build/Configure/rebuild) -- $(if $(wildcard ./files/hostapd-$(LOCAL_VARIANT).config), \ -- $(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \ -- ) -- $(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config --endef -- --TARGET_CPPFLAGS := \ -- -I$(STAGING_DIR)/usr/include/libnl-tiny \ -- -I$(PKG_BUILD_DIR)/src/crypto \ -- $(TARGET_CPPFLAGS) \ -- -I$(CURDIR)/madwifi \ -- -DCONFIG_LIBNL20 \ -- -D_GNU_SOURCE \ -- $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY)) -- --TARGET_CFLAGS += -ffunction-sections -fdata-sections --TARGET_LDFLAGS += -Wl,--gc-sections --ifeq ($(findstring supplicant,$(BUILD_VARIANT)),) -- TARGET_LDFLAGS += -lubox -lubus --endif -- --ifdef CONFIG_PACKAGE_kmod-mac80211 -- TARGET_LDFLAGS += -lm -lnl-tiny --endif -- --define Build/RunMake -- CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ -- $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ -- $(TARGET_CONFIGURE_OPTS) \ -- $(DRIVER_MAKEOPTS) \ -- LIBS="$(TARGET_LDFLAGS)" \ -- LIBS_c="" \ -- BCHECK= \ -- $(2) --endef -- --define Build/Compile/wpad -- echo ` \ -- $(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \ -- $(call Build/RunMake,wpa_supplicant,-s MULTICALL=1 dump_cflags) | \ -- sed -e 's,-n ,,g' -e 's,$(TARGET_CFLAGS),,' \ -- ` > $(PKG_BUILD_DIR)/.cflags -- +$(call Build/RunMake,hostapd, \ -- CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \ -- MULTICALL=1 \ -- hostapd_cli hostapd_multi.a \ -- ) -- +$(call Build/RunMake,wpa_supplicant, \ -- CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \ -- MULTICALL=1 \ -- wpa_cli wpa_supplicant_multi.a \ -- ) -- $(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \ -- $(TARGET_CFLAGS) \ -- ./files/multicall.c \ -- $(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \ -- $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \ -- $(TARGET_LDFLAGS) --endef -- --define Build/Compile/hostapd -- $(call Build/RunMake,hostapd, \ -- hostapd hostapd_cli \ -- ) --endef -- --define Build/Compile/supplicant -- $(call Build/RunMake,wpa_supplicant, \ -- wpa_cli wpa_supplicant \ -- ) --endef -- --define Build/Compile -- $(Build/Compile/$(LOCAL_TYPE)) --endef -- --define Install/hostapd -- $(INSTALL_DIR) $(1)/lib/wifi -- $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh -- $(INSTALL_DIR) $(1)/usr/sbin --endef -- --define Install/supplicant -- $(INSTALL_DIR) $(1)/lib/wifi -- $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh -- $(INSTALL_DIR) $(1)/usr/sbin --endef -- --define Package/hostapd/install -- $(call Install/hostapd,$(1)) -- $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/ --endef --Package/hostapd-mini/install = $(Package/hostapd/install) -- --ifneq ($(LOCAL_TYPE),supplicant) -- define Package/hostapd-utils/install -- $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/rc.button -- $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/ -- $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps -- endef --endif -- --define Package/wpad/install -- $(call Install/hostapd,$(1)) -- $(call Install/supplicant,$(1)) -- $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/ -- ln -sf wpad $(1)/usr/sbin/hostapd -- ln -sf wpad $(1)/usr/sbin/wpa_supplicant --endef --Package/wpad-mini/install = $(Package/wpad/install) -- --define Package/wpa-supplicant/install -- $(call Install/supplicant,$(1)) -- $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/ --endef --Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install) --Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install) -- --ifneq ($(LOCAL_TYPE),hostapd) -- define Package/wpa-cli/install -- $(INSTALL_DIR) $(1)/usr/sbin -- $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/ -- endef --endif -- --$(eval $(call BuildPackage,hostapd)) --$(eval $(call BuildPackage,hostapd-mini)) --$(eval $(call BuildPackage,wpad)) --$(eval $(call BuildPackage,wpad-mini)) --$(eval $(call BuildPackage,wpa-supplicant)) --$(eval $(call BuildPackage,wpa-supplicant-mini)) --$(eval $(call BuildPackage,wpa-supplicant-p2p)) --$(eval $(call BuildPackage,wpa-cli)) --$(eval $(call BuildPackage,hostapd-utils)) -diff --git a/package/hostapd/files/hostapd-full.config b/package/hostapd/files/hostapd-full.config -deleted file mode 100644 -index bc999c0..0000000 ---- a/package/hostapd/files/hostapd-full.config -+++ /dev/null -@@ -1,169 +0,0 @@ --# Example hostapd build time configuration --# --# This file lists the configuration options that are used when building the --# hostapd binary. All lines starting with # are ignored. Configuration option --# lines must be commented out complete, if they are not to be included, i.e., --# just setting VARIABLE=n is not disabling that variable. --# --# This file is included in Makefile, so variables like CFLAGS and LIBS can also --# be modified from here. In most cass, these lines should use += in order not --# to override previous values of the variables. -- --# Driver interface for Host AP driver --CONFIG_DRIVER_HOSTAP=y -- --# Driver interface for wired authenticator --CONFIG_DRIVER_WIRED=y -- --# Driver interface for madwifi driver --CONFIG_DRIVER_MADWIFI=y --#CFLAGS += -I../../madwifi # change to the madwifi source directory -- --# Driver interface for Prism54 driver --#CONFIG_DRIVER_PRISM54=y -- --# Driver interface for drivers using the nl80211 kernel interface --CONFIG_DRIVER_NL80211=y --# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be --# shipped with your distribution yet. If that is the case, you need to build --# newer libnl version and point the hostapd build to use it. --#LIBNL=/usr/src/libnl --#CFLAGS += -I$(LIBNL)/include --#LIBS += -L$(LIBNL)/lib -- --# 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 no driver (e.g., RADIUS server only) --#CONFIG_DRIVER_NONE=y -- --# IEEE 802.11F/IAPP --CONFIG_IAPP=y -- --# WPA2/IEEE 802.11i RSN pre-authentication --CONFIG_RSN_PREAUTH=y -- --# 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 -- --# Integrated EAP server --CONFIG_EAP=y -- --# EAP-MD5 for the integrated EAP server --CONFIG_EAP_MD5=y -- --# EAP-TLS for the integrated EAP server --CONFIG_EAP_TLS=y -- --# EAP-MSCHAPv2 for the integrated EAP server --CONFIG_EAP_MSCHAPV2=y -- --# EAP-PEAP for the integrated EAP server --CONFIG_EAP_PEAP=y -- --# EAP-GTC for the integrated EAP server --CONFIG_EAP_GTC=y -- --# EAP-TTLS for the integrated EAP server --CONFIG_EAP_TTLS=y -- --# EAP-SIM for the integrated EAP server --#CONFIG_EAP_SIM=y -- --# EAP-AKA for the integrated EAP server --#CONFIG_EAP_AKA=y -- --# EAP-AKA' for the integrated EAP server --# This requires CONFIG_EAP_AKA to be enabled, too. --#CONFIG_EAP_AKA_PRIME=y -- --# EAP-PAX for the integrated EAP server --#CONFIG_EAP_PAX=y -- --# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) --#CONFIG_EAP_PSK=y -- --# EAP-SAKE for the integrated EAP server --#CONFIG_EAP_SAKE=y -- --# EAP-GPSK for the integrated EAP server --#CONFIG_EAP_GPSK=y --# Include support for optional SHA256 cipher suite in EAP-GPSK --#CONFIG_EAP_GPSK_SHA256=y -- --# EAP-FAST for the integrated EAP server --# 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.9-session-ticket.patch) --# to add the needed functions. --#CONFIG_EAP_FAST=y -- --# Wi-Fi Protected Setup (WPS) --CONFIG_WPS=y --CONFIG_WPS2=y --# Enable UPnP support for external WPS Registrars --#CONFIG_WPS_UPNP=y -- --# EAP-IKEv2 --#CONFIG_EAP_IKEV2=y -- --# Trusted Network Connect (EAP-TNC) --#CONFIG_EAP_TNC=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 -- --# RADIUS authentication server. This provides access to the integrated EAP --# server from external hosts using RADIUS. --#CONFIG_RADIUS_SERVER=y -- --# Build IPv6 support for RADIUS operations --CONFIG_IPV6=y -- --# IEEE Std 802.11r-2008 (Fast BSS Transition) --CONFIG_IEEE80211R=y -- --# Use the hostapd's IEEE 802.11 authentication (ACL), but without --# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) --#CONFIG_DRIVER_RADIUS_ACL=y -- --# IEEE 802.11n (High Throughput) support --CONFIG_IEEE80211N=y -- --# Remove debugging code that is printing out debug messages to stdout. --# This can be used to reduce the size of the hostapd considerably if debugging --# code is not needed. --#CONFIG_NO_STDOUT_DEBUG=y -- --# Remove support for RADIUS accounting --#CONFIG_NO_ACCOUNTING=y -- --# Remove support for RADIUS --#CONFIG_NO_RADIUS=y -- --# Remove support for VLANs --#CONFIG_NO_VLAN=y -- --CONFIG_TLS=internal --CONFIG_INTERNAL_LIBTOMMATH=y --CONFIG_INTERNAL_AES=y --NEED_AES_DEC=y -- --CONFIG_NO_RANDOM_POOL=y --CONFIG_NO_DUMP_STATE=y -- --CONFIG_WPS=y --CONFIG_FULL_DYNAMIC_VLAN=y -- --CONFIG_ACS=y -- --CONFIG_UBUS=y -diff --git a/package/hostapd/files/hostapd-mini.config b/package/hostapd/files/hostapd-mini.config -deleted file mode 100644 -index 01a04cb..0000000 ---- a/package/hostapd/files/hostapd-mini.config -+++ /dev/null -@@ -1,162 +0,0 @@ --# Example hostapd build time configuration --# --# This file lists the configuration options that are used when building the --# hostapd binary. All lines starting with # are ignored. Configuration option --# lines must be commented out complete, if they are not to be included, i.e., --# just setting VARIABLE=n is not disabling that variable. --# --# This file is included in Makefile, so variables like CFLAGS and LIBS can also --# be modified from here. In most cass, these lines should use += in order not --# to override previous values of the variables. -- --# Driver interface for Host AP driver --CONFIG_DRIVER_HOSTAP=y -- --# Driver interface for wired authenticator --CONFIG_DRIVER_WIRED=y -- --# Driver interface for madwifi driver --CONFIG_DRIVER_MADWIFI=y --#CFLAGS += -I../../madwifi # change to the madwifi source directory -- --# Driver interface for Prism54 driver --#CONFIG_DRIVER_PRISM54=y -- --# Driver interface for drivers using the nl80211 kernel interface --CONFIG_DRIVER_NL80211=y --# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be --# shipped with your distribution yet. If that is the case, you need to build --# newer libnl version and point the hostapd build to use it. --#LIBNL=/usr/src/libnl --#CFLAGS += -I$(LIBNL)/include --#LIBS += -L$(LIBNL)/lib -- --# 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 no driver (e.g., RADIUS server only) --#CONFIG_DRIVER_NONE=y -- --# IEEE 802.11F/IAPP --# CONFIG_IAPP=y -- --# WPA2/IEEE 802.11i RSN pre-authentication --CONFIG_RSN_PREAUTH=y -- --# 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 -- --# Integrated EAP server --#CONFIG_EAP=y -- --# EAP-MD5 for the integrated EAP server --#CONFIG_EAP_MD5=y -- --# EAP-TLS for the integrated EAP server --#CONFIG_EAP_TLS=y -- --# EAP-MSCHAPv2 for the integrated EAP server --#CONFIG_EAP_MSCHAPV2=y -- --# EAP-PEAP for the integrated EAP server --#CONFIG_EAP_PEAP=y -- --# EAP-GTC for the integrated EAP server --#CONFIG_EAP_GTC=y -- --# EAP-TTLS for the integrated EAP server --#CONFIG_EAP_TTLS=y -- --# EAP-SIM for the integrated EAP server --#CONFIG_EAP_SIM=y -- --# EAP-AKA for the integrated EAP server --#CONFIG_EAP_AKA=y -- --# EAP-AKA' for the integrated EAP server --# This requires CONFIG_EAP_AKA to be enabled, too. --#CONFIG_EAP_AKA_PRIME=y -- --# EAP-PAX for the integrated EAP server --#CONFIG_EAP_PAX=y -- --# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) --#CONFIG_EAP_PSK=y -- --# EAP-SAKE for the integrated EAP server --#CONFIG_EAP_SAKE=y -- --# EAP-GPSK for the integrated EAP server --#CONFIG_EAP_GPSK=y --# Include support for optional SHA256 cipher suite in EAP-GPSK --#CONFIG_EAP_GPSK_SHA256=y -- --# EAP-FAST for the integrated EAP server --# 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.9-session-ticket.patch) --# to add the needed functions. --#CONFIG_EAP_FAST=y -- --# Wi-Fi Protected Setup (WPS) --#CONFIG_WPS=y --# Enable UPnP support for external WPS Registrars --#CONFIG_WPS_UPNP=y -- --# EAP-IKEv2 --#CONFIG_EAP_IKEV2=y -- --# Trusted Network Connect (EAP-TNC) --#CONFIG_EAP_TNC=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 -- --# RADIUS authentication server. This provides access to the integrated EAP --# server from external hosts using RADIUS. --#CONFIG_RADIUS_SERVER=y -- --# Build IPv6 support for RADIUS operations --#CONFIG_IPV6=y -- --# IEEE Std 802.11r-2008 (Fast BSS Transition) --#CONFIG_IEEE80211R=y -- --# Use the hostapd's IEEE 802.11 authentication (ACL), but without --# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) --#CONFIG_DRIVER_RADIUS_ACL=y -- --# IEEE 802.11n (High Throughput) support --CONFIG_IEEE80211N=y -- --# Remove debugging code that is printing out debug messages to stdout. --# This can be used to reduce the size of the hostapd considerably if debugging --# code is not needed. --#CONFIG_NO_STDOUT_DEBUG=y -- --# Remove support for RADIUS accounting --CONFIG_NO_ACCOUNTING=y -- --# Remove support for RADIUS --CONFIG_NO_RADIUS=y -- --# Remove support for VLANs --#CONFIG_NO_VLAN=y -- --CONFIG_TLS=internal -- --CONFIG_NO_RANDOM_POOL=y --CONFIG_NO_DUMP_STATE=y -- --CONFIG_ACS=y -- --CONFIG_UBUS=y -diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh -deleted file mode 100644 -index b55b63d..0000000 ---- a/package/hostapd/files/hostapd.sh -+++ /dev/null -@@ -1,357 +0,0 @@ --hostapd_set_bss_options() { -- local var="$1" -- local vif="$2" -- local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible -- -- config_get enc "$vif" encryption "none" -- config_get wep_rekey "$vif" wep_rekey # 300 -- config_get wpa_group_rekey "$vif" wpa_group_rekey # 300 -- config_get wpa_pair_rekey "$vif" wpa_pair_rekey # 300 -- config_get wpa_master_rekey "$vif" wpa_master_rekey # 640 -- config_get_bool ap_isolate "$vif" isolate 0 -- config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1 -- config_get max_num_sta "$vif" max_num_sta 0 -- config_get max_inactivity "$vif" max_inactivity 0 -- config_get_bool preamble "$vif" short_preamble 1 -- -- config_get device "$vif" device -- config_get hwmode "$device" hwmode -- config_get phy "$device" phy -- -- append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N" -- -- if [ "$ap_isolate" -gt 0 ]; then -- append "$var" "ap_isolate=$ap_isolate" "$N" -- fi -- if [ "$max_num_sta" -gt 0 ]; then -- append "$var" "max_num_sta=$max_num_sta" "$N" -- fi -- if [ "$max_inactivity" -gt 0 ]; then -- append "$var" "ap_max_inactivity=$max_inactivity" "$N" -- fi -- append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N" -- if [ "$preamble" -gt 0 ]; then -- append "$var" "preamble=$preamble" "$N" -- fi -- -- # Examples: -- # psk-mixed/tkip => WPA1+2 PSK, TKIP -- # wpa-psk2/tkip+aes => WPA2 PSK, CCMP+TKIP -- # wpa2/tkip+aes => WPA2 RADIUS, CCMP+TKIP -- # ... -- -- # TODO: move this parsing function somewhere generic, so that -- # later it can be reused by drivers that don't use hostapd -- -- # crypto defaults: WPA2 vs WPA1 -- case "$enc" in -- wpa2*|*psk2*) -- wpa=2 -- crypto="CCMP" -- ;; -- *mixed*) -- wpa=3 -- crypto="CCMP TKIP" -- ;; -- *) -- wpa=1 -- crypto="TKIP" -- ;; -- esac -- -- # explicit override for crypto setting -- case "$enc" in -- *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";; -- *aes|*ccmp) crypto="CCMP";; -- *tkip) crypto="TKIP";; -- esac -- -- # enforce CCMP for 11ng and 11na -- case "$hwmode:$crypto" in -- *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";; -- esac -- -- # use crypto/auth settings for building the hostapd config -- case "$enc" in -- none) -- wps_possible=1 -- wpa=0 -- crypto= -- # Here we make the assumption that if we're in open mode -- # with WPS enabled, we got to be in unconfigured state. -- wps_not_configured=1 -- ;; -- *psk*) -- config_get psk "$vif" key -- if [ ${#psk} -eq 64 ]; then -- append "$var" "wpa_psk=$psk" "$N" -- else -- append "$var" "wpa_passphrase=$psk" "$N" -- fi -- wps_possible=1 -- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" -- [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N" -- [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N" -- ;; -- *wpa*|*8021x*) -- # required fields? formats? -- # hostapd is particular, maybe a default configuration for failures -- config_get auth_server "$vif" auth_server -- [ -z "$auth_server" ] && config_get auth_server "$vif" server -- append "$var" "auth_server_addr=$auth_server" "$N" -- config_get auth_port "$vif" auth_port -- [ -z "$auth_port" ] && config_get auth_port "$vif" port -- auth_port=${auth_port:-1812} -- append "$var" "auth_server_port=$auth_port" "$N" -- config_get auth_secret "$vif" auth_secret -- [ -z "$auth_secret" ] && config_get auth_secret "$vif" key -- append "$var" "auth_server_shared_secret=$auth_secret" "$N" -- # You don't really want to enable this unless you are doing -- # some corner case testing or are using OpenWrt as a work around -- # for some systematic issues. -- config_get_bool auth_cache "$vif" auth_cache 0 -- config_get rsn_preauth "$vif" rsn_preauth -- [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "disable_pmksa_caching=1" "$N" -- [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "okc=0" "$N" -- config_get acct_server "$vif" acct_server -- [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N" -- config_get acct_port "$vif" acct_port -- [ -n "$acct_port" ] && acct_port=${acct_port:-1813} -- [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N" -- config_get acct_secret "$vif" acct_secret -- [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N" -- config_get eap_reauth_period "$vif" eap_reauth_period -- [ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N" -- config_get dae_client "$vif" dae_client -- config_get dae_secret "$vif" dae_secret -- [ -n "$dae_client" -a -n "$dae_secret" ] && { -- config_get dae_port "$vif" dae_port -- append "$var" "radius_das_port=${dae_port:-3799}" "$N" -- append "$var" "radius_das_client=$dae_client $dae_secret" "$N" -- } -- config_get nasid "$vif" nasid -- append "$var" "nas_identifier=$nasid" "$N" -- append "$var" "eapol_key_index_workaround=1" "$N" -- append "$var" "ieee8021x=1" "$N" -- append "$var" "wpa_key_mgmt=WPA-EAP" "$N" -- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" -- [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N" -- [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N" -- ;; -- *wep*) -- config_get key "$vif" key -- key="${key:-1}" -- case "$key" in -- [1234]) -- for idx in 1 2 3 4; do -- local zidx -- zidx=$(($idx - 1)) -- config_get ckey "$vif" "key${idx}" -- [ -n "$ckey" ] && \ -- append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N" -- done -- append "$var" "wep_default_key=$((key - 1))" "$N" -- ;; -- *) -- append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N" -- append "$var" "wep_default_key=0" "$N" -- [ -n "$wep_rekey" ] && append "$var" "wep_rekey_period=$wep_rekey" "$N" -- ;; -- esac -- case "$enc" in -- *shared*) -- auth_algs=2 -- ;; -- *mixed*) -- auth_algs=3 -- ;; -- esac -- wpa=0 -- crypto= -- ;; -- *) -- wpa=0 -- crypto= -- ;; -- esac -- append "$var" "auth_algs=${auth_algs:-1}" "$N" -- append "$var" "wpa=$wpa" "$N" -- [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N" -- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" -- -- config_get ssid "$vif" ssid -- config_get bridge "$vif" bridge -- config_get ieee80211d "$vif" ieee80211d -- config_get iapp_interface "$vif" iapp_interface -- -- config_get_bool wps_pbc "$vif" wps_pushbutton 0 -- config_get_bool wps_label "$vif" wps_label 0 -- -- config_get config_methods "$vif" wps_config -- [ "$wps_pbc" -gt 0 ] && append config_methods push_button -- -- [ -n "$wps_possible" -a -n "$config_methods" ] && { -- config_get device_type "$vif" wps_device_type "6-0050F204-1" -- config_get device_name "$vif" wps_device_name "OpenWrt AP" -- config_get manufacturer "$vif" wps_manufacturer "openwrt.org" -- config_get wps_pin "$vif" wps_pin "12345670" -- -- config_get_bool ext_registrar "$vif" ext_registrar 0 -- [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N" -- -- append "$var" "eap_server=1" "$N" -- append "$var" "ap_pin=$wps_pin" "$N" -- append "$var" "wps_state=${wps_not_configured:-2}" "$N" -- append "$var" "ap_setup_locked=0" "$N" -- append "$var" "device_type=$device_type" "$N" -- append "$var" "device_name=$device_name" "$N" -- append "$var" "manufacturer=$manufacturer" "$N" -- append "$var" "config_methods=$config_methods" "$N" -- } -- -- append "$var" "ssid=$ssid" "$N" -- [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N" -- [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" -- [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" -- -- if [ "$wpa" -ge "2" ] -- then -- # RSN -> allow preauthentication. You have two -- # options, rsn_preauth for production or rsn_preauth_testing -- # for validation / testing. -- if [ -n "$bridge" -a "$rsn_preauth" = 1 ] -- then -- append "$var" "rsn_preauth=1" "$N" -- append "$var" "rsn_preauth_interfaces=$bridge" "$N" -- append "$var" "okc=1" "$N" -- else -- # RSN preauthentication testings hould disable -- # Opportunistic Key Caching (okc) as otherwise the PMKSA -- # entry for a test could come from the Opportunistic Key Caching -- config_get rsn_preauth_testing "$vif" rsn_preauth_testing -- if [ -n "$bridge" -a "$rsn_preauth_testing" = 1 ] -- then -- append "$var" "rsn_preauth=1" "$N" -- append "$var" "rsn_preauth_interfaces=$bridge" "$N" -- append "$var" "okc=0" "$N" -- fi -- fi -- -- # RSN -> allow management frame protection -- config_get ieee80211w "$vif" ieee80211w -- case "$ieee80211w" in -- [012]) -- append "$var" "ieee80211w=$ieee80211w" "$N" -- [ "$ieee80211w" -gt "0" ] && { -- config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout -- config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout -- [ -n "$ieee80211w_max_timeout" ] && \ -- append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" -- [ -n "$ieee80211w_retry_timeout" ] && \ -- append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N" -- } -- ;; -- esac -- fi -- -- config_get macfile "$vif" macfile -- config_get maclist "$vif" maclist -- if [ -z "$macfile" ] -- then -- # if no macfile has been specified, fallback to the default name -- # and truncate file to avoid aggregating entries over time -- macfile="/var/run/hostapd-$ifname.maclist" -- echo "" > "$macfile" -- else -- if [ -n "$maclist" ] -- then -- # to avoid to overwrite the original file, make a copy -- # before appending the entries specified by the maclist -- # option -- cp $macfile $macfile.maclist -- macfile=$macfile.maclist -- fi -- fi -- -- if [ -n "$maclist" ] -- then -- for mac in $maclist; do -- echo "$mac" >> $macfile -- done -- fi -- -- config_get macfilter "$vif" macfilter -- case "$macfilter" in -- allow) -- append "$var" "macaddr_acl=1" "$N" -- append "$var" "accept_mac_file=$macfile" "$N" -- ;; -- deny) -- append "$var" "macaddr_acl=0" "$N" -- append "$var" "deny_mac_file=$macfile" "$N" -- ;; -- esac --} -- --hostapd_set_log_options() { -- local var="$1" -- local cfg="$2" -- local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme -- -- config_get log_level "$cfg" log_level 2 -- -- config_get_bool log_80211 "$cfg" log_80211 1 -- config_get_bool log_8021x "$cfg" log_8021x 1 -- config_get_bool log_radius "$cfg" log_radius 1 -- config_get_bool log_wpa "$cfg" log_wpa 1 -- config_get_bool log_driver "$cfg" log_driver 1 -- config_get_bool log_iapp "$cfg" log_iapp 1 -- config_get_bool log_mlme "$cfg" log_mlme 1 -- -- local log_mask=$(( \ -- ($log_80211 << 0) | \ -- ($log_8021x << 1) | \ -- ($log_radius << 2) | \ -- ($log_wpa << 3) | \ -- ($log_driver << 4) | \ -- ($log_iapp << 5) | \ -- ($log_mlme << 6) \ -- )) -- -- append "$var" "logger_syslog=$log_mask" "$N" -- append "$var" "logger_syslog_level=$log_level" "$N" -- append "$var" "logger_stdout=$log_mask" "$N" -- append "$var" "logger_stdout_level=$log_level" "$N" --} -- --hostapd_setup_vif() { -- local vif="$1" -- local driver="$2" -- local ifname device channel hwmode -- -- hostapd_cfg= -- -- config_get ifname "$vif" ifname -- config_get device "$vif" device -- config_get channel "$device" channel -- config_get hwmode "$device" hwmode -- -- hostapd_set_log_options hostapd_cfg "$device" -- hostapd_set_bss_options hostapd_cfg "$vif" -- -- case "$hwmode" in -- *bg|*gdt|*gst|*fh) hwmode=g;; -- *adt|*ast) hwmode=a;; -- esac -- [ "$channel" = auto ] && channel= -- [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" -- cat > /var/run/hostapd-$ifname.conf < --#include --#include -- --extern int hostapd_main(int argc, char **argv); --extern int wpa_supplicant_main(int argc, char **argv); -- --int main(int argc, char **argv) --{ -- bool restart = false; -- const char *prog = argv[0]; -- --restart: -- if (strstr(argv[0], "hostapd")) -- return hostapd_main(argc, argv); -- else if (strstr(argv[0], "wpa_supplicant")) -- return wpa_supplicant_main(argc, argv); -- -- if (!restart && argc > 1) { -- argv++; -- argc--; -- restart = true; -- goto restart; -- } -- -- fprintf(stderr, "Invalid command.\nUsage: %s wpa_supplicant|hostapd []\n", prog); -- return 255; --} -diff --git a/package/hostapd/files/wpa_supplicant-full.config b/package/hostapd/files/wpa_supplicant-full.config -deleted file mode 100644 -index bbfaa73..0000000 ---- a/package/hostapd/files/wpa_supplicant-full.config -+++ /dev/null -@@ -1,409 +0,0 @@ --# Example wpa_supplicant build time configuration --# --# This file lists the configuration options that are used when building the --# hostapd binary. All lines starting with # are ignored. Configuration option --# lines must be commented out complete, if they are not to be included, i.e., --# just setting VARIABLE=n is not disabling that variable. --# --# This file is included in Makefile, so variables like CFLAGS and LIBS can also --# be modified from here. In most cases, these lines should use += in order not --# to override previous values of the variables. -- -- --# Uncomment following two lines and fix the paths if you have installed OpenSSL --# or GnuTLS in non-default location --#CFLAGS += -I/usr/local/openssl/include --#LIBS += -L/usr/local/openssl/lib -- --# Some Red Hat versions seem to include kerberos header files from OpenSSL, but --# the kerberos files are not in the default include path. Following line can be --# used to fix build issues on such systems (krb5.h not found). --#CFLAGS += -I/usr/include/kerberos -- --# Example configuration for various cross-compilation platforms -- --#### sveasoft (e.g., for Linksys WRT54G) ###################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS += -I../src/include -I../../src/router/openssl/include --#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl --############################################################################### -- --#### openwrt (e.g., for Linksys WRT54G) ####################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ --# -I../WRT54GS/release/src/include --#LIBS = -lssl --############################################################################### -- -- --# 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 --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_MADWIFI=y --# Set include directory to the madwifi source tree --#CFLAGS += -I../../madwifi -- --# Driver interface for ndiswrapper --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_NDISWRAPPER=y -- --# Driver interface for Atmel driver --# CONFIG_DRIVER_ATMEL=y -- --# Driver interface for old Broadcom driver --# Please note that the newer Broadcom driver ("hybrid Linux driver") supports --# Linux wireless extensions and does not need (or even work) with the old --# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. --#CONFIG_DRIVER_BROADCOM=y --# Example path for wlioctl.h; change to match your configuration --#CFLAGS += -I/opt/WRT54GS/release/src/include -- --# Driver interface for Intel ipw2100/2200 driver --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_IPW=y -- --# Driver interface for Ralink driver --#CONFIG_DRIVER_RALINK=y -- --# Driver interface for generic Linux wireless extensions --CONFIG_DRIVER_WEXT=y -- --# Driver interface for Linux drivers using the nl80211 kernel interface --CONFIG_DRIVER_NL80211=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 --#LIBS_p += -L/usr/local/lib --#LIBS_c += -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 -- --# Include client MLME (management frame processing) for test driver --# This can be used to test MLME operations in hostapd with the test interface. --# space. --#CONFIG_CLIENT_MLME=y -- --# Driver interface for wired Ethernet drivers --CONFIG_DRIVER_WIRED=y -- --# Driver interface for the Broadcom RoboSwitch family --#CONFIG_DRIVER_ROBOSWITCH=y -- --# Driver interface for no driver (e.g., WPS ER only) --#CONFIG_DRIVER_NONE=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-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). --# This requires CONFIG_EAP_AKA to be enabled, too. --#CONFIG_EAP_AKA_PRIME=y -- --# Enable USIM simulator (Milenage) for EAP-AKA --#CONFIG_USIM_SIMULATOR=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 -- --# Wi-Fi Protected Setup (WPS) --CONFIG_WPS=y -- --# EAP-IKEv2 --#CONFIG_EAP_IKEV2=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 -- --# 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=internal -- --# 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 --# At the cost of about 4 kB of additional binary size, the internal LibTomMath --# can be configured to include faster routines for exptmod, sqr, and div to --# speed up DH and RSA calculation considerably --CONFIG_INTERNAL_LIBTOMMATH_FAST=y -- --# 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 old DBus control interface --# (fi.epitest.hostap.WPASupplicant) --#CONFIG_CTRL_IFACE_DBUS=y -- --# Add support for new DBus control interface --# (fi.w1.hostap.wpa_supplicant1) --#CONFIG_CTRL_IFACE_DBUS_NEW=y -- --# Add introspection support for new DBus control interface --#CONFIG_CTRL_IFACE_DBUS_INTRO=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_=y) or dynamically (CONFIG_EAP_=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 -- --# IEEE Std 802.11r-2008 (Fast BSS Transition) --#CONFIG_IEEE80211R=y -- --# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) --#CONFIG_DEBUG_FILE=y -- --# Enable privilege separation (see README 'Privilege separation' for details) --#CONFIG_PRIVSEP=y -- --# Enable mitigation against certain attacks against TKIP by delaying Michael --# MIC error reports by a random amount of time between 0 and 60 seconds --#CONFIG_DELAYED_MIC_ERROR_REPORT=y -- --# Enable tracing code for developer debugging --# This tracks use of memory allocations and other registrations and reports --# incorrect use with a backtrace of call (or allocation) location. --#CONFIG_WPA_TRACE=y --# For BSD, comment out these. --#LIBS += -lexecinfo --#LIBS_p += -lexecinfo --#LIBS_c += -lexecinfo -- --# Use libbfd to get more details for developer debugging --# This enables use of libbfd to get more detailed symbols for the backtraces --# generated by CONFIG_WPA_TRACE=y. --#CONFIG_WPA_TRACE_BFD=y --# For BSD, comment out these. --#LIBS += -lbfd -liberty -lz --#LIBS_p += -lbfd -liberty -lz --#LIBS_c += -lbfd -liberty -lz -- --CONFIG_NO_RANDOM_POOL=y --NEED_80211_COMMON=y -- --CONFIG_IBSS_RSN=y -diff --git a/package/hostapd/files/wpa_supplicant-mini.config b/package/hostapd/files/wpa_supplicant-mini.config -deleted file mode 100644 -index a33e6f0..0000000 ---- a/package/hostapd/files/wpa_supplicant-mini.config -+++ /dev/null -@@ -1,407 +0,0 @@ --# Example wpa_supplicant build time configuration --# --# This file lists the configuration options that are used when building the --# hostapd binary. All lines starting with # are ignored. Configuration option --# lines must be commented out complete, if they are not to be included, i.e., --# just setting VARIABLE=n is not disabling that variable. --# --# This file is included in Makefile, so variables like CFLAGS and LIBS can also --# be modified from here. In most cases, these lines should use += in order not --# to override previous values of the variables. -- -- --# Uncomment following two lines and fix the paths if you have installed OpenSSL --# or GnuTLS in non-default location --#CFLAGS += -I/usr/local/openssl/include --#LIBS += -L/usr/local/openssl/lib -- --# Some Red Hat versions seem to include kerberos header files from OpenSSL, but --# the kerberos files are not in the default include path. Following line can be --# used to fix build issues on such systems (krb5.h not found). --#CFLAGS += -I/usr/include/kerberos -- --# Example configuration for various cross-compilation platforms -- --#### sveasoft (e.g., for Linksys WRT54G) ###################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS += -I../src/include -I../../src/router/openssl/include --#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl --############################################################################### -- --#### openwrt (e.g., for Linksys WRT54G) ####################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ --# -I../WRT54GS/release/src/include --#LIBS = -lssl --############################################################################### -- -- --# 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 --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_MADWIFI=y --# Set include directory to the madwifi source tree --#CFLAGS += -I../../madwifi -- --# Driver interface for ndiswrapper --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_NDISWRAPPER=y -- --# Driver interface for Atmel driver --# CONFIG_DRIVER_ATMEL=y -- --# Driver interface for old Broadcom driver --# Please note that the newer Broadcom driver ("hybrid Linux driver") supports --# Linux wireless extensions and does not need (or even work) with the old --# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. --#CONFIG_DRIVER_BROADCOM=y --# Example path for wlioctl.h; change to match your configuration --#CFLAGS += -I/opt/WRT54GS/release/src/include -- --# Driver interface for Intel ipw2100/2200 driver --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_IPW=y -- --# Driver interface for Ralink driver --#CONFIG_DRIVER_RALINK=y -- --# Driver interface for generic Linux wireless extensions --CONFIG_DRIVER_WEXT=y -- --# Driver interface for Linux drivers using the nl80211 kernel interface --CONFIG_DRIVER_NL80211=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 --#LIBS_p += -L/usr/local/lib --#LIBS_c += -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 -- --# Include client MLME (management frame processing) for test driver --# This can be used to test MLME operations in hostapd with the test interface. --# space. --#CONFIG_CLIENT_MLME=y -- --# Driver interface for wired Ethernet drivers --CONFIG_DRIVER_WIRED=y -- --# Driver interface for the Broadcom RoboSwitch family --#CONFIG_DRIVER_ROBOSWITCH=y -- --# Driver interface for no driver (e.g., WPS ER only) --#CONFIG_DRIVER_NONE=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-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). --# This requires CONFIG_EAP_AKA to be enabled, too. --#CONFIG_EAP_AKA_PRIME=y -- --# Enable USIM simulator (Milenage) for EAP-AKA --#CONFIG_USIM_SIMULATOR=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 -- --# Wi-Fi Protected Setup (WPS) --#CONFIG_WPS=y -- --# EAP-IKEv2 --#CONFIG_EAP_IKEV2=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 -- --# 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=internal -- --# 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 --# At the cost of about 4 kB of additional binary size, the internal LibTomMath --# can be configured to include faster routines for exptmod, sqr, and div to --# speed up DH and RSA calculation considerably --#CONFIG_INTERNAL_LIBTOMMATH_FAST=y -- --# 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 old DBus control interface --# (fi.epitest.hostap.WPASupplicant) --#CONFIG_CTRL_IFACE_DBUS=y -- --# Add support for new DBus control interface --# (fi.w1.hostap.wpa_supplicant1) --#CONFIG_CTRL_IFACE_DBUS_NEW=y -- --# Add introspection support for new DBus control interface --#CONFIG_CTRL_IFACE_DBUS_INTRO=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_=y) or dynamically (CONFIG_EAP_=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 -- --# IEEE Std 802.11r-2008 (Fast BSS Transition) --#CONFIG_IEEE80211R=y -- --# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) --#CONFIG_DEBUG_FILE=y -- --# Enable privilege separation (see README 'Privilege separation' for details) --#CONFIG_PRIVSEP=y -- --# Enable mitigation against certain attacks against TKIP by delaying Michael --# MIC error reports by a random amount of time between 0 and 60 seconds --#CONFIG_DELAYED_MIC_ERROR_REPORT=y -- --# Enable tracing code for developer debugging --# This tracks use of memory allocations and other registrations and reports --# incorrect use with a backtrace of call (or allocation) location. --#CONFIG_WPA_TRACE=y --# For BSD, comment out these. --#LIBS += -lexecinfo --#LIBS_p += -lexecinfo --#LIBS_c += -lexecinfo -- --# Use libbfd to get more details for developer debugging --# This enables use of libbfd to get more detailed symbols for the backtraces --# generated by CONFIG_WPA_TRACE=y. --#CONFIG_WPA_TRACE_BFD=y --# For BSD, comment out these. --#LIBS += -lbfd -liberty -lz --#LIBS_p += -lbfd -liberty -lz --#LIBS_c += -lbfd -liberty -lz -- --CONFIG_NO_RANDOM_POOL=y --NEED_80211_COMMON=y -diff --git a/package/hostapd/files/wpa_supplicant-p2p.config b/package/hostapd/files/wpa_supplicant-p2p.config -deleted file mode 100644 -index 82e0bf0..0000000 ---- a/package/hostapd/files/wpa_supplicant-p2p.config -+++ /dev/null -@@ -1,412 +0,0 @@ --# Example wpa_supplicant build time configuration --# --# This file lists the configuration options that are used when building the --# hostapd binary. All lines starting with # are ignored. Configuration option --# lines must be commented out complete, if they are not to be included, i.e., --# just setting VARIABLE=n is not disabling that variable. --# --# This file is included in Makefile, so variables like CFLAGS and LIBS can also --# be modified from here. In most cases, these lines should use += in order not --# to override previous values of the variables. -- -- --# Uncomment following two lines and fix the paths if you have installed OpenSSL --# or GnuTLS in non-default location --#CFLAGS += -I/usr/local/openssl/include --#LIBS += -L/usr/local/openssl/lib -- --# Some Red Hat versions seem to include kerberos header files from OpenSSL, but --# the kerberos files are not in the default include path. Following line can be --# used to fix build issues on such systems (krb5.h not found). --#CFLAGS += -I/usr/include/kerberos -- --# Example configuration for various cross-compilation platforms -- --#### sveasoft (e.g., for Linksys WRT54G) ###################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS += -I../src/include -I../../src/router/openssl/include --#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl --############################################################################### -- --#### openwrt (e.g., for Linksys WRT54G) ####################################### --#CC=mipsel-uclibc-gcc --#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc --#CFLAGS += -Os --#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ --# -I../WRT54GS/release/src/include --#LIBS = -lssl --############################################################################### -- -- --# 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 --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_MADWIFI=y --# Set include directory to the madwifi source tree --#CFLAGS += -I../../madwifi -- --# Driver interface for ndiswrapper --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_NDISWRAPPER=y -- --# Driver interface for Atmel driver --# CONFIG_DRIVER_ATMEL=y -- --# Driver interface for old Broadcom driver --# Please note that the newer Broadcom driver ("hybrid Linux driver") supports --# Linux wireless extensions and does not need (or even work) with the old --# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. --#CONFIG_DRIVER_BROADCOM=y --# Example path for wlioctl.h; change to match your configuration --#CFLAGS += -I/opt/WRT54GS/release/src/include -- --# Driver interface for Intel ipw2100/2200 driver --# Deprecated; use CONFIG_DRIVER_WEXT=y instead. --#CONFIG_DRIVER_IPW=y -- --# Driver interface for Ralink driver --#CONFIG_DRIVER_RALINK=y -- --# Driver interface for generic Linux wireless extensions --CONFIG_DRIVER_WEXT=y -- --# Driver interface for Linux drivers using the nl80211 kernel interface --CONFIG_DRIVER_NL80211=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 --#LIBS_p += -L/usr/local/lib --#LIBS_c += -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 -- --# Include client MLME (management frame processing) for test driver --# This can be used to test MLME operations in hostapd with the test interface. --# space. --#CONFIG_CLIENT_MLME=y -- --# Driver interface for wired Ethernet drivers --CONFIG_DRIVER_WIRED=y -- --# Driver interface for the Broadcom RoboSwitch family --#CONFIG_DRIVER_ROBOSWITCH=y -- --# Driver interface for no driver (e.g., WPS ER only) --#CONFIG_DRIVER_NONE=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-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). --# This requires CONFIG_EAP_AKA to be enabled, too. --#CONFIG_EAP_AKA_PRIME=y -- --# Enable USIM simulator (Milenage) for EAP-AKA --#CONFIG_USIM_SIMULATOR=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 -- --# Wi-Fi Protected Setup (WPS) --CONFIG_WPS=y -- --# EAP-IKEv2 --#CONFIG_EAP_IKEV2=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 -- --# 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=internal -- --# 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 --# At the cost of about 4 kB of additional binary size, the internal LibTomMath --# can be configured to include faster routines for exptmod, sqr, and div to --# speed up DH and RSA calculation considerably --CONFIG_INTERNAL_LIBTOMMATH_FAST=y -- --# 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 old DBus control interface --# (fi.epitest.hostap.WPASupplicant) --#CONFIG_CTRL_IFACE_DBUS=y -- --# Add support for new DBus control interface --# (fi.w1.hostap.wpa_supplicant1) --#CONFIG_CTRL_IFACE_DBUS_NEW=y -- --# Add introspection support for new DBus control interface --#CONFIG_CTRL_IFACE_DBUS_INTRO=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_=y) or dynamically (CONFIG_EAP_=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 -- --# IEEE Std 802.11r-2008 (Fast BSS Transition) --#CONFIG_IEEE80211R=y -- --# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) --#CONFIG_DEBUG_FILE=y -- --# Enable privilege separation (see README 'Privilege separation' for details) --#CONFIG_PRIVSEP=y -- --# Enable mitigation against certain attacks against TKIP by delaying Michael --# MIC error reports by a random amount of time between 0 and 60 seconds --#CONFIG_DELAYED_MIC_ERROR_REPORT=y -- --# Enable tracing code for developer debugging --# This tracks use of memory allocations and other registrations and reports --# incorrect use with a backtrace of call (or allocation) location. --#CONFIG_WPA_TRACE=y --# For BSD, comment out these. --#LIBS += -lexecinfo --#LIBS_p += -lexecinfo --#LIBS_c += -lexecinfo -- --# Use libbfd to get more details for developer debugging --# This enables use of libbfd to get more detailed symbols for the backtraces --# generated by CONFIG_WPA_TRACE=y. --#CONFIG_WPA_TRACE_BFD=y --# For BSD, comment out these. --#LIBS += -lbfd -liberty -lz --#LIBS_p += -lbfd -liberty -lz --#LIBS_c += -lbfd -liberty -lz -- --CONFIG_NO_RANDOM_POOL=y --NEED_80211_COMMON=y -- --CONFIG_IBSS_RSN=y -- --CONFIG_P2P=y --CONFIG_AP=y -diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh -deleted file mode 100644 -index bd86801..0000000 ---- a/package/hostapd/files/wpa_supplicant.sh -+++ /dev/null -@@ -1,194 +0,0 @@ --wpa_supplicant_setup_vif() { -- local vif="$1" -- local driver="$2" -- local key="$key" -- local options="$3" -- local freq="" -- local ht="$5" -- local ap_scan="" -- local scan_ssid="1" -- [ -n "$4" ] && freq="frequency=$4" -- -- config_get enc "$vif" encryption -- config_get key "$vif" key -- -- local net_cfg bridge -- config_get bridge "$vif" bridge -- [ -z "$bridge" ] && { -- net_cfg="$(find_net_config "$vif")" -- [ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")" -- config_set "$vif" bridge "$bridge" -- } -- -- local mode ifname wds modestr="" -- config_get mode "$vif" mode -- config_get ifname "$vif" ifname -- config_get_bool wds "$vif" wds 0 -- [ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || { -- echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface" -- return 1 -- } -- [ "$mode" = "adhoc" ] && { -- modestr="mode=1" -- scan_ssid="0" -- ap_scan="ap_scan=2" -- } -- -- key_mgmt='NONE' -- case "$enc" in -- *none*) ;; -- *wep*) -- config_get key "$vif" key -- key="${key:-1}" -- case "$key" in -- [1234]) -- for idx in 1 2 3 4; do -- local zidx -- zidx=$(($idx - 1)) -- config_get ckey "$vif" "key${idx}" -- [ -n "$ckey" ] && \ -- append "wep_key${zidx}" "wep_key${zidx}=$(prepare_key_wep "$ckey")" -- done -- wep_tx_keyidx="wep_tx_keyidx=$((key - 1))" -- ;; -- *) -- wep_key0="wep_key0=$(prepare_key_wep "$key")" -- wep_tx_keyidx="wep_tx_keyidx=0" -- ;; -- esac -- ;; -- *psk*) -- key_mgmt='WPA-PSK' -- # if you want to use PSK with a non-nl80211 driver you -- # have to use WPA-NONE and wext driver for wpa_s -- [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && { -- key_mgmt='WPA-NONE' -- driver='wext' -- } -- if [ ${#key} -eq 64 ]; then -- passphrase="psk=${key}" -- else -- passphrase="psk=\"${key}\"" -- fi -- case "$enc" in -- *psk2*) -- proto='proto=RSN' -- config_get ieee80211w "$vif" ieee80211w -- ;; -- *psk*) -- proto='proto=WPA' -- ;; -- esac -- ;; -- *wpa*|*8021x*) -- proto='proto=WPA2' -- key_mgmt='WPA-EAP' -- config_get ieee80211w "$vif" ieee80211w -- config_get ca_cert "$vif" ca_cert -- config_get eap_type "$vif" eap_type -- ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""} -- case "$eap_type" in -- tls) -- pairwise='pairwise=CCMP' -- group='group=CCMP' -- config_get identity "$vif" identity -- config_get client_cert "$vif" client_cert -- config_get priv_key "$vif" priv_key -- config_get priv_key_pwd "$vif" priv_key_pwd -- identity="identity=\"$identity\"" -- client_cert="client_cert=\"$client_cert\"" -- priv_key="private_key=\"$priv_key\"" -- priv_key_pwd="private_key_passwd=\"$priv_key_pwd\"" -- ;; -- peap|ttls) -- config_get auth "$vif" auth -- config_get identity "$vif" identity -- config_get password "$vif" password -- phase2="phase2=\"auth=${auth:-MSCHAPV2}\"" -- identity="identity=\"$identity\"" -- password="${password:+password=\"$password\"}" -- ;; -- esac -- eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')" -- ;; -- esac -- -- case "$ieee80211w" in -- [012]) -- ieee80211w="ieee80211w=$ieee80211w" -- ;; -- esac -- -- local fixed_freq bssid1 beacon_int brates mrate -- config_get ifname "$vif" ifname -- config_get bridge "$vif" bridge -- config_get ssid "$vif" ssid -- config_get bssid "$vif" bssid -- bssid1=${bssid:+"bssid=$bssid"} -- beacon_int=${beacon_int:+"beacon_int=$beacon_int"} -- -- local br brval brsub brstr -- [ -n "$basic_rate_list" ] && { -- for br in $basic_rate_list; do -- brval="$(($br / 1000))" -- brsub="$((($br / 100) % 10))" -- [ "$brsub" -gt 0 ] && brval="$brval.$brsub" -- [ -n "$brstr" ] && brstr="$brstr," -- brstr="$brstr$brval" -- done -- brates=${basic_rate_list:+"rates=$brstr"} -- } -- -- local mcval="" -- [ -n "$mcast_rate" ] && { -- mcval="$(($mcast_rate / 1000))" -- mcsub="$(( ($mcast_rate / 100) % 10 ))" -- [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub" -- mrate=${mcast_rate:+"mcast_rate=$mcval"} -- } -- -- local ht_str -- [ -n "$ht" ] && ht_str="htmode=$ht" -- -- rm -rf /var/run/wpa_supplicant-$ifname -- cat > /var/run/wpa_supplicant-$ifname.conf < --#include --#include --#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 -- --#ifndef list_for_each_entry_reverse --#define list_for_each_entry_reverse(pos, head, member) \ -- for (pos = list_entry((head)->prev, typeof(*pos), member); \ -- prefetch(pos->member.prev), &pos->member != (head); \ -- pos = list_entry(pos->member.prev, typeof(*pos), member)) --#endif -- --#ifndef NETDEV_TX_OK --#define NETDEV_TX_OK 0 --#define NETDEV_TX_BUSY 1 --#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 --#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 __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 -- --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) --#define AUTOCONF_INCLUDED 1 --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21) --#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,14) --typedef int gfp_t; --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) --static inline int timeval_compare(struct timeval *lhs, struct timeval *rhs) --{ -- if (lhs->tv_sec < rhs->tv_sec) -- return -1; -- if (lhs->tv_sec > rhs->tv_sec) -- return 1; -- return lhs->tv_usec - rhs->tv_usec; --} --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) --#define IRQF_SHARED SA_SHIRQ --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27) --#define netdev_priv(_netdev) ((_netdev)->priv) --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) --#define skb_end_pointer(_skb) ((_skb)->end) --#define skb_tail_pointer(_skb) ((_skb)->tail) --#define skb_set_network_header(_skb, _offset) \ -- do { (_skb)->nh.raw = (_skb)->data + (_offset); } while(0) --#define skb_reset_network_header(_skb) \ -- do { (_skb)->nh.raw = (_skb)->data; } while(0) --#define skb_mac_header(_skb) ((_skb)->mac.raw) --#define skb_reset_mac_header(_skb) \ -- do { (_skb)->mac.raw = (_skb)->data; } while(0) --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) --#define CTL_AUTO -2 --#define DEV_ATH 9 --#else --#define CTL_AUTO CTL_UNNUMBERED --#define DEV_ATH CTL_UNNUMBERED --#endif -- --/* __skb_append got a third parameter in 2.6.14 */ --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) --#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new) --#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) --#define __skb_queue_after(_list, _old, _new) __skb_append(_old, _new, _list) --#endif -- --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) --#define CTLNAME(x) .ctl_name = x, --#else --#define CTLNAME(x) --#endif -- --#endif /* __KERNEL__ */ -- --#endif /* _ATH_COMPAT_H_ */ -diff --git a/package/hostapd/madwifi/net80211/_ieee80211.h b/package/hostapd/madwifi/net80211/_ieee80211.h -deleted file mode 100644 -index 2d2a06f..0000000 ---- a/package/hostapd/madwifi/net80211/_ieee80211.h -+++ /dev/null -@@ -1,325 +0,0 @@ --/*- -- * 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 3207 2008-01-18 21:25:05Z mtaylor $ -- */ --#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 PHYs */ --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 */ --}; -- --/* -- * True if this mode will send beacon on a regular interval, like AP -- * or IBSS -- */ --#define IEEE80211_IS_MODE_BEACON(_opmode) \ -- ((_opmode == IEEE80211_M_IBSS) || \ -- (_opmode == IEEE80211_M_HOSTAP)) -- --/* -- * True if this mode must behave like a DFS master, ie do Channel -- * Check Availability and In Service Monitoring. We need to make sure -- * that all modes cannot send data without being authorized. Such -- * enforcement is not done in monitor mode however. -- */ -- --#define IEEE80211_IS_MODE_DFS_MASTER(_opmode) \ -- ((_opmode == IEEE80211_M_IBSS) || \ -- (_opmode == IEEE80211_M_AHDEMO) || \ -- (_opmode == IEEE80211_M_HOSTAP) || \ -- (_opmode == IEEE80211_M_WDS)) -- --/* -- * 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 */ --}; -- --enum ieee80211_scanflags { -- IEEE80211_NOSCAN_DEFAULT = (1 << 0), -- IEEE80211_NOSCAN_SET = (1 << 1), --}; -- --/* -- * 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 */ -- u_int8_t ic_scanflags; -- u_int8_t ic_idletime; /* phy idle time in % */ --}; -- --#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_CHANCHANGE_TBTT_COUNT 0 --#define IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT 3 -- --#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) -- --#define IEEE80211_IS_CHAN_RADAR(_c) \ -- (((_c)->ic_flags & IEEE80211_CHAN_RADAR) != 0) --#define IEEE80211_IS_CHAN_PASSIVE(_c) \ -- (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0) --#define IEEE80211_ARE_CHANS_SAME_MODE(_a, _b) \ -- (((_a)->ic_flags & IEEE80211_CHAN_ALLTURBO) == ((_b)->ic_flags & IEEE80211_CHAN_ALLTURBO)) -- --/* 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) -- --/* -- * Spectrum Management (IEEE 802.11h-2003) -- */ -- --/* algorithm for (re)association based on supported channels -- * (the one mentioned in 11.6.1 as out of scope of .11h) */ --enum ieee80211_sc_algorithm { -- IEEE80211_SC_NONE, -- /* -- * Do not disallow anyone from associating. When needed, channel will -- * be switched to the most suitable channel, no matter client stations -- * support it or not. -- */ -- -- IEEE80211_SC_LOOSE, -- /* -- * Do not disallow anyone from associating. When needed, channel will -- * be switched to a suitable channel, which will be chosen taking -- * ni->ni_suppchans and ic->ic_sc_sldg under consideration. -- */ -- -- IEEE80211_SC_TIGHT, -- /* -- * Allow to associate if there are at least ic->ic_mincom channels -- * common to the associating station and all of the already associated -- * stations. If the number of new common channels is less than -- * required, consider disassociating some other STAs. Such a -- * disassociation will be performed if (and only if) the association we -- * are currently considering would be then possible and the count of -- * the resultant set of common channels (ic_chan_nodes[i] == -- * ic_cn_total) would increase by some amount. Whether the number of -- * the new channels that could be gained is enough to sacrifice a -- * number of STAs is determined by the ic->ic_slcg parameter. -- */ -- -- IEEE80211_SC_STRICT -- /* -- * Basically the same behavior as IEEE80211_SC_TIGHT, except that if a -- * station does not specify Supported Channels, then it is denied to -- * associate. -- */ --}; -- --/* -- * 802.11 rate set. -- */ --#define IEEE80211_RATE_SIZE 8 /* 802.11 standard */ --#define IEEE80211_RATE_MAXSIZE 15 /* max rates we'll handle */ --#define IEEE80211_SANITISE_RATESIZE(_rsz) \ -- ((_rsz > IEEE80211_RATE_MAXSIZE) ? IEEE80211_RATE_MAXSIZE : _rsz) -- --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_ */ -diff --git a/package/hostapd/madwifi/net80211/ieee80211.h b/package/hostapd/madwifi/net80211/ieee80211.h -deleted file mode 100644 -index a39d4b9..0000000 ---- a/package/hostapd/madwifi/net80211/ieee80211.h -+++ /dev/null -@@ -1,997 +0,0 @@ --/*- -- * 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 3268 2008-01-26 20:48:11Z 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_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 -- --#define IEEE80211_FRM_HAS_BODY(_wh) \ -- (((_wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != \ -- IEEE80211_FC0_TYPE_CTL) -- --/* -- * 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; -- --/* -- * Power Constraint information element. -- */ --struct ieee80211_ie_pwrcnstr { -- u_int8_t pc_id; /* IEEE80211_ELEMID_PWRCNSTR */ -- u_int8_t pc_len; /* == 2 */ -- u_int8_t pc_lpc; /* Local Power Constraint [dB] */ --} __packed; -- --/* -- * Power Capability information element. -- */ --struct ieee80211_ie_pwrcap { -- u_int8_t pc_id; /* IEEE80211_ELEMID_PWRCAP */ -- u_int8_t pc_len; /* == 2 */ -- int8_t pc_mintxpow; /* Minimum Transmit Power Capability [dBm] */ -- int8_t pc_maxtxpow; /* Maximum Transmit Power Capability [dBm] */ --} __packed; -- --/* -- * Supported Channels information element. -- */ --#define IEEE80211_SUPPCHAN_MAX_PAIRS (127) --struct ieee80211_ie_sc { -- u_int8_t sc_id; /* IEEE80211_ELEMID_SUPPCHAN */ -- u_int8_t sc_len; /* == 2 * number of sc_subband elements */ -- struct { -- u_int8_t sc_first; /* First Channel Number */ -- u_int8_t sc_number; /* Number of Channels */ -- } __packed sc_subband[IEEE80211_SUPPCHAN_MAX_PAIRS]; --} __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_HOPPATRNPARMS = 8, -- IEEE80211_ELEMID_HOPPATRNTABLE = 9, -- IEEE80211_ELEMID_REQINFO = 10, -- IEEE80211_ELEMID_QBSSLOAD = 11, -- IEEE80211_ELEMID_EDCAPARAM = 12, -- IEEE80211_ELEMID_TSPEC = 13, -- IEEE80211_ELEMID_TRAFCLASS = 14, -- IEEE80211_ELEMID_SCHEDULE = 15, -- 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_TSDELAY = 43, -- IEEE80211_ELEMID_TCLASSPROC = 44, -- IEEE80211_ELEMID_QOS = 46, -- IEEE80211_ELEMID_RSN = 48, -- /* 49 reserved */ -- 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 --#define BITCTL_BUFD_MCAST 1 --#define BITCTL_BUFD_UCAST_AID_MASK ((u_int8_t)~(BITCTL_BUFD_MCAST)) --#define BITCTL_BUFD_UCAST_AID_SHIFT 1 -- --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_PWRCAP_UNACCEPTABLE = 10, -- IEEE80211_REASON_SUPPCHAN_UNACCEPTABLE = 11, -- 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_SM_REQUIRED = 22, -- IEEE80211_STATUS_PWRCAP_UNACCEPTABLE = 23, -- IEEE80211_STATUS_SUPPCHAN_UNACCEPTABLE = 24, -- 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 APs 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_ */ -diff --git a/package/hostapd/madwifi/net80211/ieee80211_crypto.h b/package/hostapd/madwifi/net80211/ieee80211_crypto.h -deleted file mode 100644 -index b34f359..0000000 ---- a/package/hostapd/madwifi/net80211/ieee80211_crypto.h -+++ /dev/null -@@ -1,207 +0,0 @@ --/*- -- * 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 3068 2007-12-21 17:46:02Z mentor $ -- */ --#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, 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, int force) --{ -- const struct ieee80211_cipher *cip = k->wk_cipher; -- return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen, force) : 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_ */ -diff --git a/package/hostapd/madwifi/net80211/ieee80211_ioctl.h b/package/hostapd/madwifi/net80211/ieee80211_ioctl.h -deleted file mode 100644 -index 204303b..0000000 ---- a/package/hostapd/madwifi/net80211/ieee80211_ioctl.h -+++ /dev/null -@@ -1,715 +0,0 @@ --/*- -- * 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 3314 2008-01-30 23:50:16Z mtaylor $ -- */ --#ifndef _NET80211_IEEE80211_IOCTL_H_ --#define _NET80211_IEEE80211_IOCTL_H_ -- --/* -- * IEEE 802.11 ioctls. -- */ --#include --#include --#include -- --/* -- * 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_mcastdisabled; /* rx discard due to of mcast disabled */ -- 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_assoc_badscie; /* rx assoc w/ bad SC 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_node_fdisassoc; /* forced node disassociation */ -- 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 { -- /* NB: This is different to ieee80211_keyix_t, but this is OK as -- * values are unique over the low order bits. */ -- 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 ACLs */ -- 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; -- int8_t isi_noise; -- u_int16_t isi_capinfo; /* capabilities */ -- u_int8_t isi_athflags; /* Atheros capabilities */ -- u_int8_t isi_erp; /* ERP element */ -- u_int8_t isi_macaddr[IEEE80211_ADDR_LEN]; -- u_int8_t isi_nrates; /* negotiated rates */ -- u_int8_t isi_rates[IEEE80211_RATE_MAXSIZE]; -- u_int8_t isi_txrate; /* index to isi_rates[] */ -- u_int16_t isi_ie_len; /* IE length */ -- u_int16_t isi_associd; /* assoc response */ -- u_int16_t isi_txpower; /* current tx power */ -- u_int16_t isi_vlan; /* vlan tag */ -- u_int16_t isi_txseqs[17]; /* seq to be transmitted */ -- u_int16_t isi_rxseqs[17]; /* seq previous for qos frames*/ -- u_int16_t isi_inact; /* inactivity timer */ -- u_int8_t isi_uapsd; /* UAPSD queues */ -- u_int8_t isi_opmode; /* sta operating mode */ -- -- /* 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_SETMAC 55 /* set interface wds mac addr */ --#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 --#endif --/* The maximum size of a iwpriv structure is IW_PRIV_SIZE_MASK, which was -- * exceeded for some time by chaninfo ioctl. These macros change the size -- * encoding for anything larger than IW_PRIV_SIZE_MASK from bytes to 4-byte -- * multiples so that the padded size fits under IW_PRIV_SIZE_MASK. */ --#define IW_PRIV_BLOB_LENGTH_ENCODING(_SIZE) \ -- (((_SIZE) == ((_SIZE) & IW_PRIV_SIZE_MASK)) ? \ -- (_SIZE) : \ -- (((_SIZE) / sizeof(uint32_t)) + \ -- (((_SIZE) == (((_SIZE) / sizeof(uint32_t)) * sizeof(int))) ? \ -- 0 : 1))) --#define IW_PRIV_BLOB_TYPE_ENCODING(_SIZE) \ -- (((_SIZE) == ((_SIZE) & IW_PRIV_SIZE_MASK)) ? \ -- (IW_PRIV_TYPE_BYTE | (_SIZE)) : \ -- (IW_PRIV_TYPE_INT | IW_PRIV_BLOB_LENGTH_ENCODING((_SIZE)))) -- --#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_RADAR (SIOCIWFIRSTPRIV+17) --#define IEEE80211_IOCTL_SETKEY (SIOCIWFIRSTPRIV+18) --#define IEEE80211_IOCTL_WRITEREG (SIOCIWFIRSTPRIV+19) --#define IEEE80211_IOCTL_DELKEY (SIOCIWFIRSTPRIV+20) --#define IEEE80211_IOCTL_HALMAP (SIOCIWFIRSTPRIV+21) --#define IEEE80211_IOCTL_ADDMAC (SIOCIWFIRSTPRIV+22) --#define IEEE80211_IOCTL_DELMAC (SIOCIWFIRSTPRIV+24) --#define IEEE80211_IOCTL_WDSADDMAC (SIOCIWFIRSTPRIV+25) --#define IEEE80211_IOCTL_WDSSETMAC (SIOCIWFIRSTPRIV+26) --#define IEEE80211_IOCTL_KICKMAC (SIOCIWFIRSTPRIV+30) --#define IEEE80211_IOCTL_SETSCANLIST (SIOCIWFIRSTPRIV+31) -- --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_INACT_TICK = 27, /* station inactivity timer tick (seconds) */ -- 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 */ -- IEEE80211_PARAM_DOTH_ALGORITHM = 63, /* spectrum management algorithm */ -- IEEE80211_PARAM_DOTH_MINCOM = 64, /* minimum number of common channels */ -- IEEE80211_PARAM_DOTH_SLCG = 65, /* permil of Stations Lost per Channel Gained */ -- IEEE80211_PARAM_DOTH_SLDG = 66, /* permil of Stations Lost per rssi Db Gained */ -- IEEE80211_PARAM_TXCONT = 67, /* continuous transmit mode (boolean) */ -- IEEE80211_PARAM_TXCONT_RATE = 68, /* continuous transmit mode data rate (in mbit/sec) - will use closest match from current rate table */ -- IEEE80211_PARAM_TXCONT_POWER = 69, /* power level in units of 0.5dBm */ -- IEEE80211_PARAM_DFS_TESTMODE = 70, /* do not perform DFS actions (i.e. markng DFS and channel change on interference), just report them via debug. */ -- IEEE80211_PARAM_DFS_CACTIME = 71, /* how long do we wait for chan availability -- scans ? -- FCC requires 60s, so that is the default. */ -- IEEE80211_PARAM_DFS_EXCLPERIOD = 72, /* DFS no-occupancy limit - how long do we stay -- off a channel once radar is detected? -- FCC requires 30m, so that is the default. */ -- IEEE80211_PARAM_BEACON_MISS_THRESH = 73, /* Beacon miss threshold (in beacons) */ -- IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */ -- IEEE80211_PARAM_MAXRATE = 75, /* Maximum rate (by table index) */ -- IEEE80211_PARAM_MINRATE = 76, /* Minimum rate (by table index) */ -- IEEE80211_PARAM_PROTMODE_RSSI = 77, /* RSSI Threshold for enabling protection mode */ -- IEEE80211_PARAM_PROTMODE_TIMEOUT = 78, /* Timeout for expiring protection mode */ -- IEEE80211_PARAM_BGSCAN_THRESH = 79, /* bg scan rssi threshold */ -- IEEE80211_PARAM_RSSI_DIS_THR = 80, /* rssi threshold for disconnection */ -- IEEE80211_PARAM_RSSI_DIS_COUNT = 81, /* counter for rssi threshold */ -- IEEE80211_PARAM_WDS_SEP = 82, /* move wds stations into separate interfaces */ -- IEEE80211_PARAM_MAXASSOC = 83, /* maximum associated stations */ -- IEEE80211_PARAM_PROBEREQ = 84, /* enable handling of probe requests */ -- IEEE80211_PARAM_BEACON_TXP = 85, /* set beacon tx power */ --}; -- --#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_ */ -diff --git a/package/hostapd/patches/100-madwifi_key_fixes.patch b/package/hostapd/patches/100-madwifi_key_fixes.patch -deleted file mode 100644 -index dcd6d10..0000000 ---- a/package/hostapd/patches/100-madwifi_key_fixes.patch -+++ /dev/null -@@ -1,34 +0,0 @@ ----- a/src/drivers/driver_madwifi.c --+++ b/src/drivers/driver_madwifi.c --@@ -450,7 +450,9 @@ wpa_driver_madwifi_set_key(const char *i -- -- memset(&wk, 0, sizeof(wk)); -- wk.ik_type = cipher; --- wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT; --+ wk.ik_flags = IEEE80211_KEY_RECV; --+ if (set_tx) --+ wk.ik_flags |= IEEE80211_KEY_XMIT; -- if (addr == NULL || is_broadcast_ether_addr(addr)) { -- memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN); -- wk.ik_keyix = key_idx; --@@ -462,6 +464,20 @@ wpa_driver_madwifi_set_key(const char *i -- wk.ik_keylen = key_len; -- memcpy(wk.ik_keydata, key, key_len); -- --+#ifdef WORDS_BIGENDIAN --+#define WPA_KEY_RSC_LEN 8 --+ { --+ size_t i; --+ u8 tmp[WPA_KEY_RSC_LEN]; --+ os_memset(tmp, 0, sizeof(tmp)); --+ for (i = 0; i < seq_len; i++) --+ tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i]; --+ os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN); --+ } --+#else /* WORDS_BIGENDIAN */ --+ os_memcpy(&wk.ik_keyrsc, seq, seq_len); --+#endif /* WORDS_BIGENDIAN */ --+ -- ret = set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk)); -- if (ret < 0) { -- wpa_printf(MSG_DEBUG, "%s: Failed to set key (addr %s" -diff --git a/package/hostapd/patches/110-bool_fix.patch b/package/hostapd/patches/110-bool_fix.patch -deleted file mode 100644 -index 9f82b0b..0000000 ---- a/package/hostapd/patches/110-bool_fix.patch -+++ /dev/null -@@ -1,14 +0,0 @@ ----- a/src/ap/ieee802_1x.c --+++ b/src/ap/ieee802_1x.c --@@ -1933,9 +1933,9 @@ void ieee802_1x_notify_pre_auth(struct e -- } -- -- ---static const char * bool_txt(Boolean bool) --+static const char * bool_txt(Boolean bool_val) -- { --- return bool ? "TRUE" : "FALSE"; --+ return bool_val ? "TRUE" : "FALSE"; -- } -- -- -diff --git a/package/hostapd/patches/120-daemonize_fix.patch b/package/hostapd/patches/120-daemonize_fix.patch -deleted file mode 100644 -index 20a1eb3..0000000 ---- a/package/hostapd/patches/120-daemonize_fix.patch -+++ /dev/null -@@ -1,97 +0,0 @@ ----- a/src/utils/os_unix.c --+++ b/src/utils/os_unix.c --@@ -9,6 +9,7 @@ -- #include "includes.h" -- -- #include --+#include -- -- #ifdef ANDROID -- #include --@@ -154,59 +155,46 @@ int os_gmtime(os_time_t t, struct os_tm -- return 0; -- } -- --- ---#ifdef __APPLE__ ---#include ---static int os_daemon(int nochdir, int noclose) --+int os_daemonize(const char *pid_file) -- { --- int devnull; --+ int pid = 0, i, devnull; -- --- if (chdir("/") < 0) --- return -1; --+#if defined(__uClinux__) || defined(__sun__) --+ return -1; --+#else /* defined(__uClinux__) || defined(__sun__) */ -- --- devnull = open("/dev/null", O_RDWR); --- if (devnull < 0) --+#ifndef __APPLE__ --+ pid = fork(); --+ if (pid < 0) -- return -1; --+#endif -- --- if (dup2(devnull, STDIN_FILENO) < 0) { --- close(devnull); --- return -1; --+ if (pid > 0) { --+ if (pid_file) { --+ FILE *f = fopen(pid_file, "w"); --+ if (f) { --+ fprintf(f, "%u\n", pid); --+ fclose(f); --+ } --+ } --+ _exit(0); -- } -- --- if (dup2(devnull, STDOUT_FILENO) < 0) { --- close(devnull); --+ if (setsid() < 0) -- return -1; --- } -- --- if (dup2(devnull, STDERR_FILENO) < 0) { --- close(devnull); --+ if (chdir("/") < 0) -- return -1; --- } --- --- return 0; ---} ---#else /* __APPLE__ */ ---#define os_daemon daemon ---#endif /* __APPLE__ */ -- --- ---int os_daemonize(const char *pid_file) ---{ ---#if defined(__uClinux__) || defined(__sun__) --- return -1; ---#else /* defined(__uClinux__) || defined(__sun__) */ --- if (os_daemon(0, 0)) { --- perror("daemon"); --+ devnull = open("/dev/null", O_RDWR); --+ if (devnull < 0) -- return -1; --- } -- --- if (pid_file) { --- FILE *f = fopen(pid_file, "w"); --- if (f) { --- fprintf(f, "%u\n", getpid()); --- fclose(f); --- } --- } --+ for (i = 0; i <= STDERR_FILENO; i++) --+ dup2(devnull, i); --+ --+ if (devnull > 2) --+ close(devnull); -- -- return -0; -- #endif /* defined(__uClinux__) || defined(__sun__) */ -diff --git a/package/hostapd/patches/130-wds_sta_del_fix.patch b/package/hostapd/patches/130-wds_sta_del_fix.patch -deleted file mode 100644 -index 06b6906..0000000 ---- a/package/hostapd/patches/130-wds_sta_del_fix.patch -+++ /dev/null -@@ -1,13 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -9083,8 +9083,8 @@ static int i802_set_wds_sta(void *priv, -- name); -- -- i802_set_sta_vlan(priv, addr, bss->ifname, 0); --- return wpa_driver_nl80211_if_remove(priv, WPA_IF_AP_VLAN, --- name); --+ nl80211_remove_iface(drv, if_nametoindex(name)); --+ return 0; -- } -- } -- -diff --git a/package/hostapd/patches/200-multicall.patch b/package/hostapd/patches/200-multicall.patch -deleted file mode 100644 -index 2289f51..0000000 ---- a/package/hostapd/patches/200-multicall.patch -+++ /dev/null -@@ -1,246 +0,0 @@ ----- a/hostapd/Makefile --+++ b/hostapd/Makefile --@@ -14,6 +14,7 @@ CFLAGS += -I../src/utils -- # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include -- -- -include .config --+-include $(if $(MULTICALL), ../wpa_supplicant/.config) -- -- ifndef CONFIG_OS -- ifdef CONFIG_NATIVE_WINDOWS --@@ -200,10 +201,14 @@ ifdef CONFIG_IEEE80211AC -- CFLAGS += -DCONFIG_IEEE80211AC -- endif -- --+ifndef MULTICALL --+CFLAGS += -DNO_SUPPLICANT --+endif --+ -- include ../src/drivers/drivers.mak ---OBJS += $(DRV_AP_OBJS) ---CFLAGS += $(DRV_AP_CFLAGS) ---LDFLAGS += $(DRV_AP_LDFLAGS) --+OBJS += $(sort $(DRV_AP_OBJS) $(if $(MULTICALL),$(DRV_WPA_OBJS))) --+CFLAGS += $(DRV_AP_CFLAGS) $(if $(MULTICALL),$(DRV_WPA_CFLAGS)) --+LDFLAGS += $(DRV_AP_LDFLAGS) $(if $(MULTICALL),$(DRV_WPA_LDFLAGS)) -- LIBS += $(DRV_AP_LIBS) -- -- ifdef CONFIG_L2_PACKET --@@ -890,6 +895,12 @@ install: all -- -- BCHECK=../src/drivers/build.hostapd -- --+hostapd_multi.a: $(BCHECK) $(OBJS) --+ $(Q)$(CC) -c -o hostapd_multi.o -Dmain=hostapd_main $(CFLAGS) main.c --+ @$(E) " CC " $< --+ @rm -f $@ --+ @$(AR) cr $@ hostapd_multi.o $(OBJS) --+ -- hostapd: $(BCHECK) $(OBJS) -- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) -- @$(E) " LD " $@ --@@ -928,6 +939,12 @@ HOBJS += ../src/crypto/aes-internal.o -- HOBJS += ../src/crypto/aes-internal-enc.o -- endif -- --+dump_cflags: --+ @echo -n $(CFLAGS) " " --+ --+dump_ldflags: --+ @echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " " --+ -- nt_password_hash: $(NOBJS) -- $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n) -- @$(E) " LD " $@ ----- a/wpa_supplicant/Makefile --+++ b/wpa_supplicant/Makefile --@@ -14,6 +14,7 @@ CFLAGS += -I../src -- CFLAGS += -I../src/utils -- -- -include .config --+-include $(if $(MULTICALL),../hostapd/.config) -- -- BINALL=wpa_supplicant wpa_cli -- --@@ -727,6 +728,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS -- CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS -- LIBS += -ldl -rdynamic -- endif --+else --+ ifdef MULTICALL --+ OBJS += ../src/eap_common/eap_common.o --+ endif -- endif -- -- ifdef CONFIG_AP --@@ -735,9 +740,11 @@ NEED_EAP_COMMON=y -- NEED_RSN_AUTHENTICATOR=y -- CFLAGS += -DCONFIG_AP -- OBJS += ap.o --+ifndef MULTICALL -- CFLAGS += -DCONFIG_NO_RADIUS -- CFLAGS += -DCONFIG_NO_ACCOUNTING -- CFLAGS += -DCONFIG_NO_VLAN --+endif -- OBJS += ../src/ap/hostapd.o -- OBJS += ../src/ap/wpa_auth_glue.o -- OBJS += ../src/ap/utils.o --@@ -799,10 +806,18 @@ endif -- ifdef CONFIG_HS20 -- OBJS += ../src/ap/hs20.o -- endif --+else --+ ifdef MULTICALL --+ OBJS += ../src/eap_server/eap_server.o --+ OBJS += ../src/eap_server/eap_server_identity.o --+ OBJS += ../src/eap_server/eap_server_methods.o --+ endif -- endif -- -- ifdef NEED_RSN_AUTHENTICATOR --+ifndef MULTICALL -- CFLAGS += -DCONFIG_NO_RADIUS --+endif -- NEED_AES_WRAP=y -- OBJS += ../src/ap/wpa_auth.o -- OBJS += ../src/ap/wpa_auth_ie.o --@@ -1551,6 +1566,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv) -- -- $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config -- --+wpa_supplicant_multi.a: .config $(BCHECK) $(OBJS) $(EXTRA_progs) --+ $(Q)$(CC) -c -o wpa_supplicant_multi.o -Dmain=wpa_supplicant_main $(CFLAGS) main.c --+ @$(E) " CC " $< --+ @rm -f $@ --+ @$(AR) cr $@ wpa_supplicant_multi.o $(OBJS) --+ -- wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) -- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) -- @$(E) " LD " $@ --@@ -1625,6 +1646,12 @@ eap_eke.so: ../src/eap_peer/eap_eke.c .. -- %@.service: %.service.arg.in -- sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ -- --+dump_cflags: --+ @echo -n $(CFLAGS) " " --+ --+dump_ldflags: --+ @echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " " --+ -- wpa_supplicant.exe: wpa_supplicant -- mv -f $< $@ -- wpa_cli.exe: wpa_cli ----- a/src/drivers/driver.h --+++ b/src/drivers/driver.h --@@ -4079,8 +4079,8 @@ union wpa_event_data { -- * Driver wrapper code should call this function whenever an event is received -- * from the driver. -- */ ---void wpa_supplicant_event(void *ctx, enum wpa_event_type event, --- union wpa_event_data *data); --+extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data); -- -- -- /* ----- a/src/ap/drv_callbacks.c --+++ b/src/ap/drv_callbacks.c --@@ -844,8 +844,8 @@ static void hostapd_event_dfs_nop_finish -- #endif /* NEED_AP_MLME */ -- -- ---void wpa_supplicant_event(void *ctx, enum wpa_event_type event, --- union wpa_event_data *data) --+void hostapd_wpa_event(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data) -- { -- struct hostapd_data *hapd = ctx; -- #ifndef CONFIG_NO_STDOUT_DEBUG ----- a/wpa_supplicant/wpa_priv.c --+++ b/wpa_supplicant/wpa_priv.c --@@ -817,8 +817,8 @@ static void wpa_priv_send_ft_response(st -- } -- -- ---void wpa_supplicant_event(void *ctx, enum wpa_event_type event, --- union wpa_event_data *data) --+static void supplicant_event(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data) -- { -- struct wpa_priv_interface *iface = ctx; -- --@@ -960,6 +960,7 @@ int main(int argc, char *argv[]) -- if (os_program_init()) -- return -1; -- --+ wpa_supplicant_event = supplicant_event; -- wpa_priv_fd_workaround(); -- -- for (;;) { ----- a/wpa_supplicant/events.c --+++ b/wpa_supplicant/events.c --@@ -2710,8 +2710,8 @@ static void wpa_supplicant_update_channe -- } -- -- ---void wpa_supplicant_event(void *ctx, enum wpa_event_type event, --- union wpa_event_data *data) --+void supplicant_event(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data) -- { -- struct wpa_supplicant *wpa_s = ctx; -- ----- a/wpa_supplicant/wpa_supplicant.c --+++ b/wpa_supplicant/wpa_supplicant.c --@@ -3138,6 +3138,9 @@ static void wpa_supplicant_deinit_iface( -- os_free(wpa_s); -- } -- --+extern void supplicant_event(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data); --+ -- -- /** -- * wpa_supplicant_add_iface - Add a new network interface --@@ -3329,6 +3332,7 @@ struct wpa_global * wpa_supplicant_init( -- wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); -- #endif /* CONFIG_NO_WPA_MSG */ -- --+ wpa_supplicant_event = supplicant_event; -- wpa_debug_open_file(params->wpa_debug_file_path); -- if (params->wpa_debug_syslog) -- wpa_debug_open_syslog(); ----- a/hostapd/main.c --+++ b/hostapd/main.c --@@ -511,6 +511,9 @@ static int hostapd_get_ctrl_iface_group( -- return 0; -- } -- --+void hostapd_wpa_event(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data); --+ -- -- int main(int argc, char *argv[]) -- { --@@ -541,6 +544,7 @@ int main(int argc, char *argv[]) -- interfaces.global_iface_name = NULL; -- interfaces.global_ctrl_sock = -1; -- --+ wpa_supplicant_event = hostapd_wpa_event; -- for (;;) { -- c = getopt(argc, argv, "b:Bde:f:hKP:Ttvg:G:"); -- if (c < 0) ----- a/src/drivers/drivers.c --+++ b/src/drivers/drivers.c --@@ -7,7 +7,11 @@ -- */ -- -- #include "includes.h" --+#include "common.h" --+#include "driver.h" -- --+void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event, --+ union wpa_event_data *data); -- -- #ifdef CONFIG_DRIVER_WEXT -- extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */ -diff --git a/package/hostapd/patches/300-noscan.patch b/package/hostapd/patches/300-noscan.patch -deleted file mode 100644 -index 17e7661..0000000 ---- a/package/hostapd/patches/300-noscan.patch -+++ /dev/null -@@ -1,32 +0,0 @@ ----- a/hostapd/config_file.c --+++ b/hostapd/config_file.c --@@ -2412,6 +2412,8 @@ static int hostapd_config_fill(struct ho -- } -- #endif /* CONFIG_IEEE80211W */ -- #ifdef CONFIG_IEEE80211N --+ } else if (os_strcmp(buf, "noscan") == 0) { --+ conf->noscan = atoi(pos); -- } else if (os_strcmp(buf, "ieee80211n") == 0) { -- conf->ieee80211n = atoi(pos); -- } else if (os_strcmp(buf, "ht_capab") == 0) { ----- a/src/ap/ap_config.h --+++ b/src/ap/ap_config.h --@@ -527,6 +527,7 @@ struct hostapd_config { -- -- int ht_op_mode_fixed; -- u16 ht_capab; --+ int noscan; -- int ieee80211n; -- int secondary_channel; -- int require_ht; ----- a/src/ap/hw_features.c --+++ b/src/ap/hw_features.c --@@ -577,7 +577,7 @@ static int ieee80211n_check_40mhz(struct -- { -- struct wpa_driver_scan_params params; -- --- if (!iface->conf->secondary_channel) --+ if (!iface->conf->secondary_channel || iface->conf->noscan) -- return 0; /* HT40 not used */ -- -- hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); -diff --git a/package/hostapd/patches/310-rescan_immediately.patch b/package/hostapd/patches/310-rescan_immediately.patch -deleted file mode 100644 -index 043f07c..0000000 ---- a/package/hostapd/patches/310-rescan_immediately.patch -+++ /dev/null -@@ -1,11 +0,0 @@ ----- a/wpa_supplicant/wpa_supplicant.c --+++ b/wpa_supplicant/wpa_supplicant.c --@@ -2488,7 +2488,7 @@ static struct wpa_supplicant * wpa_suppl -- if (wpa_s == NULL) -- return NULL; -- wpa_s->scan_req = INITIAL_SCAN_REQ; --- wpa_s->scan_interval = 5; --+ wpa_s->scan_interval = 1; -- wpa_s->new_connection = 1; -- wpa_s->parent = wpa_s; -- wpa_s->sched_scanning = 0; -diff --git a/package/hostapd/patches/320-optional_rfkill.patch b/package/hostapd/patches/320-optional_rfkill.patch -deleted file mode 100644 -index 7ec51b1..0000000 ---- a/package/hostapd/patches/320-optional_rfkill.patch -+++ /dev/null -@@ -1,261 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -254,7 +254,9 @@ struct wpa_driver_nl80211_data { -- int if_removed; -- int if_disabled; -- int ignore_if_down_event; --+#ifdef CONFIG_RFKILL -- struct rfkill_data *rfkill; --+#endif -- struct wpa_driver_capa capa; -- u8 *extended_capa, *extended_capa_mask; -- unsigned int extended_capa_len; --@@ -3630,7 +3632,7 @@ static int wpa_driver_nl80211_init_nl(st -- return 0; -- } -- --- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_nl80211_rfkill_blocked(void *ctx) -- { -- wpa_printf(MSG_DEBUG, "nl80211: RFKILL blocked"); --@@ -3652,6 +3654,7 @@ static void wpa_driver_nl80211_rfkill_un -- } -- /* rtnetlink ifup handler will report interface as enabled */ -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static void wpa_driver_nl80211_handle_eapol_tx_status(int sock, --@@ -3740,7 +3743,9 @@ static void * wpa_driver_nl80211_drv_ini -- const u8 *set_addr) -- { -- struct wpa_driver_nl80211_data *drv; --+#ifdef CONFIG_RFKILL -- struct rfkill_config *rcfg; --+#endif -- struct i802_bss *bss; -- -- if (global_priv == NULL) --@@ -3778,6 +3783,7 @@ static void * wpa_driver_nl80211_drv_ini -- if (nl80211_init_bss(bss)) -- goto failed; -- --+#ifdef CONFIG_RFKILL -- rcfg = os_zalloc(sizeof(*rcfg)); -- if (rcfg == NULL) -- goto failed; --@@ -3790,6 +3796,7 @@ static void * wpa_driver_nl80211_drv_ini -- wpa_printf(MSG_DEBUG, "nl80211: RFKILL status not available"); -- os_free(rcfg); -- } --+#endif /* CONFIG_RFKILL */ -- -- if (linux_iface_up(drv->global->ioctl_sock, ifname) > 0) -- drv->start_iface_up = 1; --@@ -4116,10 +4123,12 @@ static void nl80211_mgmt_unsubscribe(str -- } -- -- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_nl80211_send_rfkill(void *eloop_ctx, void *timeout_ctx) -- { -- wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL); -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static void nl80211_del_p2pdev(struct i802_bss *bss) --@@ -4246,13 +4255,16 @@ wpa_driver_nl80211_finish_drv_init(struc -- } -- -- if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1)) { --+#ifdef CONFIG_RFKILL -- if (rfkill_is_blocked(drv->rfkill)) { -- wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable " -- "interface '%s' due to rfkill", -- bss->ifname); -- drv->if_disabled = 1; -- send_rfkill_event = 1; --- } else { --+ } else --+#endif --+ { -- wpa_printf(MSG_ERROR, "nl80211: Could not set " -- "interface '%s' UP", bss->ifname); -- return -1; --@@ -4268,8 +4280,10 @@ wpa_driver_nl80211_finish_drv_init(struc -- return -1; -- -- if (send_rfkill_event) { --+#ifdef CONFIG_RFKILL -- eloop_register_timeout(0, 0, wpa_driver_nl80211_send_rfkill, -- drv, drv->ctx); --+#endif -- } -- -- return 0; --@@ -4347,7 +4361,9 @@ static void wpa_driver_nl80211_deinit(st -- -- netlink_send_oper_ifla(drv->global->netlink, drv->ifindex, 0, -- IF_OPER_UP); --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- -- eloop_cancel_timeout(wpa_driver_nl80211_scan_timeout, drv, drv->ctx); -- ----- a/src/drivers/driver_wext.c --+++ b/src/drivers/driver_wext.c --@@ -740,7 +740,7 @@ static void wpa_driver_wext_event_rtm_de -- } -- } -- --- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_wext_rfkill_blocked(void *ctx) -- { -- wpa_printf(MSG_DEBUG, "WEXT: RFKILL blocked"); --@@ -762,7 +762,7 @@ static void wpa_driver_wext_rfkill_unblo -- } -- /* rtnetlink ifup handler will report interface as enabled */ -- } --- --+#endif /* CONFIG_RFKILL */ -- -- static void wext_get_phy_name(struct wpa_driver_wext_data *drv) -- { --@@ -808,7 +808,9 @@ void * wpa_driver_wext_init(void *ctx, c -- { -- struct wpa_driver_wext_data *drv; -- struct netlink_config *cfg; --+#ifdef CONFIG_RFKILL -- struct rfkill_config *rcfg; --+#endif -- char path[128]; -- struct stat buf; -- --@@ -843,6 +845,7 @@ void * wpa_driver_wext_init(void *ctx, c -- goto err2; -- } -- --+#ifdef CONFIG_RFKILL -- rcfg = os_zalloc(sizeof(*rcfg)); -- if (rcfg == NULL) -- goto err3; --@@ -855,6 +858,7 @@ void * wpa_driver_wext_init(void *ctx, c -- wpa_printf(MSG_DEBUG, "WEXT: RFKILL status not available"); -- os_free(rcfg); -- } --+#endif /* CONFIG_RFKILL */ -- -- drv->mlme_sock = -1; -- --@@ -872,7 +876,9 @@ void * wpa_driver_wext_init(void *ctx, c -- return drv; -- -- err3: --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- netlink_deinit(drv->netlink); -- err2: -- close(drv->ioctl_sock); --@@ -882,10 +888,12 @@ err1: -- } -- -- --+#ifdef CONFIG_RFKILL -- static void wpa_driver_wext_send_rfkill(void *eloop_ctx, void *timeout_ctx) -- { -- wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL); -- } --+#endif /* CONFIG_RFKILL */ -- -- -- static int wpa_driver_wext_finish_drv_init(struct wpa_driver_wext_data *drv) --@@ -893,13 +901,16 @@ static int wpa_driver_wext_finish_drv_in -- int send_rfkill_event = 0; -- -- if (linux_set_iface_flags(drv->ioctl_sock, drv->ifname, 1) < 0) { --+#ifdef CONFIG_RFKILL -- if (rfkill_is_blocked(drv->rfkill)) { -- wpa_printf(MSG_DEBUG, "WEXT: Could not yet enable " -- "interface '%s' due to rfkill", -- drv->ifname); -- drv->if_disabled = 1; -- send_rfkill_event = 1; --- } else { --+ } else --+#endif --+ { -- wpa_printf(MSG_ERROR, "WEXT: Could not set " -- "interface '%s' UP", drv->ifname); -- return -1; --@@ -947,8 +958,10 @@ static int wpa_driver_wext_finish_drv_in -- 1, IF_OPER_DORMANT); -- -- if (send_rfkill_event) { --+#ifdef CONFIG_RFKILL -- eloop_register_timeout(0, 0, wpa_driver_wext_send_rfkill, -- drv, drv->ctx); --+#endif -- } -- -- return 0; --@@ -978,7 +991,9 @@ void wpa_driver_wext_deinit(void *priv) -- -- netlink_send_oper_ifla(drv->netlink, drv->ifindex, 0, IF_OPER_UP); -- netlink_deinit(drv->netlink); --+#ifdef CONFIG_RFKILL -- rfkill_deinit(drv->rfkill); --+#endif -- -- if (drv->mlme_sock >= 0) -- eloop_unregister_read_sock(drv->mlme_sock); ----- a/src/drivers/drivers.mak --+++ b/src/drivers/drivers.mak --@@ -25,7 +25,6 @@ NEED_SME=y -- NEED_AP_MLME=y -- NEED_NETLINK=y -- NEED_LINUX_IOCTL=y ---NEED_RFKILL=y -- -- ifdef CONFIG_LIBNL32 -- DRV_LIBS += -lnl-3 --@@ -109,7 +108,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT -- CONFIG_WIRELESS_EXTENSION=y -- NEED_NETLINK=y -- NEED_LINUX_IOCTL=y ---NEED_RFKILL=y -- endif -- -- ifdef CONFIG_DRIVER_NDIS --@@ -135,7 +133,6 @@ endif -- ifdef CONFIG_WIRELESS_EXTENSION -- DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION -- DRV_WPA_OBJS += ../src/drivers/driver_wext.o ---NEED_RFKILL=y -- endif -- -- ifdef NEED_NETLINK --@@ -148,6 +145,7 @@ endif -- -- ifdef NEED_RFKILL -- DRV_OBJS += ../src/drivers/rfkill.o --+DRV_WPA_CFLAGS += -DCONFIG_RFKILL -- endif -- -- ifdef CONFIG_VLAN_NETLINK ----- a/src/drivers/driver_wext.h --+++ b/src/drivers/driver_wext.h --@@ -22,7 +22,9 @@ struct wpa_driver_wext_data { -- int ifindex2; -- int if_removed; -- int if_disabled; --+#ifdef CONFIG_RFKILL -- struct rfkill_data *rfkill; --+#endif -- u8 *assoc_req_ies; -- size_t assoc_req_ies_len; -- u8 *assoc_resp_ies; -diff --git a/package/hostapd/patches/330-nl80211_fix_set_freq.patch b/package/hostapd/patches/330-nl80211_fix_set_freq.patch -deleted file mode 100644 -index a505a60..0000000 ---- a/package/hostapd/patches/330-nl80211_fix_set_freq.patch -+++ /dev/null -@@ -1,20 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -6860,7 +6860,7 @@ static int wpa_driver_nl80211_set_freq(s -- -- nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY); -- --- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); --+ NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex); -- if (nl80211_put_freq_params(msg, freq) < 0) -- goto nla_put_failure; -- --@@ -11322,7 +11322,7 @@ static int nl80211_switch_channel(void * -- return -ENOMEM; -- -- nl80211_cmd(drv, msg, 0, NL80211_CMD_CHANNEL_SWITCH); --- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); --+ NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex); -- NLA_PUT_U32(msg, NL80211_ATTR_CH_SWITCH_COUNT, settings->cs_count); -- ret = nl80211_put_freq_params(msg, &settings->freq_params); -- if (ret) -diff --git a/package/hostapd/patches/340-reload_freq_change.patch b/package/hostapd/patches/340-reload_freq_change.patch -deleted file mode 100644 -index 9316794..0000000 ---- a/package/hostapd/patches/340-reload_freq_change.patch -+++ /dev/null -@@ -1,29 +0,0 @@ ----- a/src/ap/hostapd.c --+++ b/src/ap/hostapd.c --@@ -72,6 +72,16 @@ static void hostapd_reload_bss(struct ho -- #endif /* CONFIG_NO_RADIUS */ -- -- ssid = &hapd->conf->ssid; --+ --+ hostapd_set_freq(hapd, hapd->iconf->hw_mode, hapd->iface->freq, --+ hapd->iconf->channel, --+ hapd->iconf->ieee80211n, --+ hapd->iconf->ieee80211ac, --+ hapd->iconf->secondary_channel, --+ hapd->iconf->vht_oper_chwidth, --+ hapd->iconf->vht_oper_centr_freq_seg0_idx, --+ hapd->iconf->vht_oper_centr_freq_seg1_idx); --+ -- if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next && -- ssid->wpa_passphrase_set && ssid->wpa_passphrase) { -- /* --@@ -172,6 +182,9 @@ int hostapd_reload_config(struct hostapd -- oldconf = hapd->iconf; -- iface->conf = newconf; -- --+ if (iface->conf->channel) --+ iface->freq = hostapd_hw_get_freq(hapd, iface->conf->channel); --+ -- for (j = 0; j < iface->num_bss; j++) { -- hapd = iface->bss[j]; -- hapd->iconf = newconf; -diff --git a/package/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/hostapd/patches/350-nl80211_del_beacon_bss.patch -deleted file mode 100644 -index 885922c..0000000 ---- a/package/hostapd/patches/350-nl80211_del_beacon_bss.patch -+++ /dev/null -@@ -1,50 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -4290,18 +4290,20 @@ wpa_driver_nl80211_finish_drv_init(struc -- } -- -- ---static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv) --+static int wpa_driver_nl80211_del_bss_beacon(struct i802_bss *bss) -- { --+ struct wpa_driver_nl80211_data *drv = bss->drv; -- struct nl_msg *msg; -- -- msg = nlmsg_alloc(); -- if (!msg) -- return -ENOMEM; -- --+ bss->beacon_set = 0; -- wpa_printf(MSG_DEBUG, "nl80211: Remove beacon (ifindex=%d)", --- drv->ifindex); --+ bss->ifindex); -- nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_BEACON); --- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); --+ NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, bss->ifindex); -- -- return send_and_recv_msgs(drv, msg, NULL, NULL); -- nla_put_failure: --@@ -4309,6 +4311,15 @@ static int wpa_driver_nl80211_del_beacon -- return -ENOBUFS; -- } -- --+static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv) --+{ --+ struct i802_bss *bss; --+ --+ for (bss = drv->first_bss; bss; bss = bss->next) --+ wpa_driver_nl80211_del_bss_beacon(bss); --+ --+ return 0; --+} -- -- /** -- * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface --@@ -9911,7 +9922,6 @@ static int wpa_driver_nl80211_stop_ap(vo -- if (!is_ap_interface(drv->nlmode)) -- return -1; -- wpa_driver_nl80211_del_beacon(drv); --- bss->beacon_set = 0; -- return 0; -- } -- -diff --git a/package/hostapd/patches/360-ctrl_iface_reload.patch b/package/hostapd/patches/360-ctrl_iface_reload.patch -deleted file mode 100644 -index 170d4f2..0000000 ---- a/package/hostapd/patches/360-ctrl_iface_reload.patch -+++ /dev/null -@@ -1,98 +0,0 @@ ----- a/hostapd/ctrl_iface.c --+++ b/hostapd/ctrl_iface.c --@@ -34,6 +34,7 @@ -- #include "wps/wps.h" -- #include "config_file.h" -- #include "ctrl_iface.h" --+#include "config_file.h" -- -- -- struct wpa_ctrl_dst { --@@ -44,6 +45,7 @@ struct wpa_ctrl_dst { -- int errors; -- }; -- --+static char *reload_opts = NULL; -- -- static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level, -- const char *buf, size_t len); --@@ -153,6 +155,68 @@ static int hostapd_ctrl_iface_new_sta(st -- return 0; -- } -- --+static int hostapd_ctrl_iface_set_down(struct hostapd_data *hapd) --+{ --+ if (hapd->driver->stop_ap) --+ hapd->driver->stop_ap(hapd->drv_priv); --+ return 0; --+} --+ --+static char *get_option(char *opt, char *str) --+{ --+ int len = strlen(str); --+ --+ if (!strncmp(opt, str, len)) --+ return opt + len; --+ else --+ return NULL; --+} --+ --+static struct hostapd_config *hostapd_ctrl_iface_config_read(const char *fname) --+{ --+ struct hostapd_config *conf; --+ char *opt, *val; --+ --+ conf = hostapd_config_read(fname); --+ if (!conf) --+ return NULL; --+ --+ for (opt = strtok(reload_opts, " "); --+ opt; --+ opt = strtok(NULL, " ")) { --+ --+ if ((val = get_option(opt, "channel="))) --+ conf->channel = atoi(val); --+ else if ((val = get_option(opt, "ht_capab="))) --+ conf->ht_capab = atoi(val); --+ else if ((val = get_option(opt, "ht_capab_mask="))) --+ conf->ht_capab &= atoi(val); --+ else if ((val = get_option(opt, "sec_chan="))) --+ conf->secondary_channel = atoi(val); --+ else if ((val = get_option(opt, "hw_mode="))) --+ conf->hw_mode = atoi(val); --+ else if ((val = get_option(opt, "ieee80211n="))) --+ conf->ieee80211n = atoi(val); --+ else --+ break; --+ } --+ --+ return conf; --+} --+ --+static int hostapd_ctrl_iface_update(struct hostapd_data *hapd, char *txt) --+{ --+ struct hostapd_config * (*config_read_cb)(const char *config_fname); --+ struct hostapd_iface *iface = hapd->iface; --+ --+ config_read_cb = iface->interfaces->config_read_cb; --+ iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read; --+ reload_opts = txt; --+ --+ hostapd_reload_config(iface); --+ --+ iface->interfaces->config_read_cb = config_read_cb; --+} -- -- #ifdef CONFIG_IEEE80211W -- #ifdef NEED_AP_MLME --@@ -1199,6 +1263,10 @@ static void hostapd_ctrl_iface_receive(i -- reply_len += res; -- } -- #endif /* CONFIG_NO_RADIUS */ --+ } else if (os_strcmp(buf, "DOWN") == 0) { --+ hostapd_ctrl_iface_set_down(hapd); --+ } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { --+ hostapd_ctrl_iface_update(hapd, buf + 7); -- } else if (os_strcmp(buf, "STA-FIRST") == 0) { -- reply_len = hostapd_ctrl_iface_sta_first(hapd, reply, -- reply_size); -diff --git a/package/hostapd/patches/370-ap_sta_support.patch b/package/hostapd/patches/370-ap_sta_support.patch -deleted file mode 100644 -index a3d0572..0000000 ---- a/package/hostapd/patches/370-ap_sta_support.patch -+++ /dev/null -@@ -1,222 +0,0 @@ ----- a/wpa_supplicant/wpa_supplicant_i.h --+++ b/wpa_supplicant/wpa_supplicant_i.h --@@ -96,6 +96,11 @@ struct wpa_interface { -- const char *ifname; -- -- /** --+ * hostapd_ctrl - path to hostapd control socket for notification --+ */ --+ const char *hostapd_ctrl; --+ --+ /** -- * bridge_ifname - Optional bridge interface name -- * -- * If the driver interface (ifname) is included in a Linux bridge --@@ -325,6 +330,8 @@ struct wpa_supplicant { -- #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */ -- char bridge_ifname[16]; -- --+ struct wpa_ctrl *hostapd; --+ -- char *confname; -- char *confanother; -- struct wpa_config *conf; ----- a/wpa_supplicant/Makefile --+++ b/wpa_supplicant/Makefile --@@ -13,6 +13,10 @@ PKG_CONFIG ?= pkg-config -- CFLAGS += -I../src -- CFLAGS += -I../src/utils -- --+ifdef MULTICALL --+CFLAGS += -DMULTICALL --+endif --+ -- -include .config -- -include $(if $(MULTICALL),../hostapd/.config) -- --@@ -76,6 +80,8 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr -- OBJS_c += ../src/utils/wpa_debug.o -- OBJS_c += ../src/utils/common.o -- --+OBJS += ../src/common/wpa_ctrl.o --+ -- ifndef CONFIG_OS -- ifdef CONFIG_NATIVE_WINDOWS -- CONFIG_OS=win32 ----- a/wpa_supplicant/wpa_supplicant.c --+++ b/wpa_supplicant/wpa_supplicant.c --@@ -109,6 +109,46 @@ extern int wpa_debug_show_keys; -- extern int wpa_debug_timestamp; -- extern struct wpa_driver_ops *wpa_drivers[]; -- --+static int hostapd_stop(struct wpa_supplicant *wpa_s) --+{ --+ const char *cmd = "DOWN"; --+ char buf[256]; --+ int len = sizeof(buf); --+ --+ if (wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL) < 0) { --+ wpa_printf(MSG_ERROR, "\nFailed to stop hostapd AP interfaces\n"); --+ return -1; --+ } --+ return 0; --+} --+ --+static int hostapd_reload(struct wpa_supplicant *wpa_s, struct wpa_bss *bss) --+{ --+ char *cmd = NULL; --+ char buf[256]; --+ int len = sizeof(buf); --+ enum hostapd_hw_mode hw_mode; --+ u8 channel; --+ int ret; --+ --+ if (!bss) --+ return; --+ --+ hw_mode = ieee80211_freq_to_chan(bss->freq, &channel); --+ if (asprintf(&cmd, "UPDATE channel=%d sec_chan=0 hw_mode=%d ieee80211n=%d", --+ channel, hw_mode, !!bss->ht_capab) < 0) --+ return -1; --+ --+ ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); --+ free(cmd); --+ --+ if (ret < 0) { --+ wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n"); --+ return -1; --+ } --+ return 0; --+} --+ -- /* Configure default/group WEP keys for static WEP */ -- int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) -- { --@@ -685,8 +725,12 @@ void wpa_supplicant_set_state(struct wpa -- #endif /* CONFIG_P2P */ -- -- sme_sched_obss_scan(wpa_s, 1); --+ if (wpa_s->hostapd) --+ hostapd_reload(wpa_s, wpa_s->current_bss); -- } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING || -- state == WPA_ASSOCIATED) { --+ if (wpa_s->hostapd) --+ hostapd_stop(wpa_s); -- wpa_s->new_connection = 1; -- wpa_drv_set_operstate(wpa_s, 0); -- #ifndef IEEE8021X_EAPOL --@@ -2906,6 +2950,20 @@ static int wpa_supplicant_init_iface(str -- sizeof(wpa_s->bridge_ifname)); -- } -- --+ if (iface->hostapd_ctrl) { --+ char *cmd = "DOWN"; --+ char buf[256]; --+ int len = sizeof(buf); --+ --+ wpa_s->hostapd = wpa_ctrl_open(iface->hostapd_ctrl); --+ if (!wpa_s->hostapd) { --+ wpa_printf(MSG_ERROR, "\nFailed to connect to hostapd\n"); --+ return -1; --+ } --+ if (hostapd_stop(wpa_s) < 0) --+ return -1; --+ } --+ -- /* RSNA Supplicant Key Management - INITIALIZE */ -- eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); -- eapol_sm_notify_portValid(wpa_s->eapol, FALSE); --@@ -3125,6 +3183,11 @@ static void wpa_supplicant_deinit_iface( -- if (terminate) -- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); -- --+ if (wpa_s->hostapd) { --+ wpa_ctrl_close(wpa_s->hostapd); --+ wpa_s->hostapd = NULL; --+ } --+ -- if (wpa_s->ctrl_iface) { -- wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); -- wpa_s->ctrl_iface = NULL; ----- a/wpa_supplicant/bss.c --+++ b/wpa_supplicant/bss.c --@@ -11,6 +11,7 @@ -- #include "utils/common.h" -- #include "utils/eloop.h" -- #include "common/ieee802_11_defs.h" --+#include "common/ieee802_11_common.h" -- #include "drivers/driver.h" -- #include "wpa_supplicant_i.h" -- #include "config.h" --@@ -245,6 +246,9 @@ static void calculate_update_time(const -- static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, -- struct os_time *fetch_time) -- { --+ struct ieee80211_ht_capabilities *capab; --+ struct ieee802_11_elems elems; --+ -- dst->flags = src->flags; -- os_memcpy(dst->bssid, src->bssid, ETH_ALEN); -- dst->freq = src->freq; --@@ -255,6 +259,12 @@ static void wpa_bss_copy_res(struct wpa_ -- dst->level = src->level; -- dst->tsf = src->tsf; -- --+ memset(&elems, 0, sizeof(elems)); --+ ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0); --+ capab = (struct ieee80211_ht_capabilities *) elems.ht_capabilities; --+ if (capab) --+ dst->ht_capab = le_to_host16(capab->ht_capabilities_info); --+ -- calculate_update_time(fetch_time, src->age, &dst->last_update); -- } -- ----- a/wpa_supplicant/main.c --+++ b/wpa_supplicant/main.c --@@ -27,7 +27,7 @@ static void usage(void) -- " wpa_supplicant [-BddhKLqqstuvW] [-P] " -- "[-g] \\\n" -- " [-G] \\\n" --- " -i -c [-C] [-D] " --+ " -i -c [-C] [-D] [-H] " -- "[-p] \\\n" -- " [-b] [-f] [-e] " -- "\\\n" --@@ -72,6 +72,7 @@ static void usage(void) -- #endif /* CONFIG_DEBUG_LINUX_TRACING */ -- printf(" -t = include timestamp in debug messages\n" -- " -h = show this help text\n" --+ " -H = connect to a hostapd instance to manage state changes\n" -- " -L = show license (BSD)\n" -- " -o = override driver parameter for new interfaces\n" -- " -O = override ctrl_interface parameter for new interfaces\n" --@@ -160,7 +161,7 @@ int main(int argc, char *argv[]) -- -- for (;;) { -- c = getopt(argc, argv, --- "b:Bc:C:D:de:f:g:G:hi:I:KLNo:O:p:P:qsTtuvW"); --+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuvW"); -- if (c < 0) -- break; -- switch (c) { --@@ -207,6 +208,9 @@ int main(int argc, char *argv[]) -- usage(); -- exitcode = 0; -- goto out; --+ case 'H': --+ iface->hostapd_ctrl = optarg; --+ break; -- case 'i': -- iface->ifname = optarg; -- break; ----- a/wpa_supplicant/bss.h --+++ b/wpa_supplicant/bss.h --@@ -69,6 +69,8 @@ struct wpa_bss { -- u8 ssid[32]; -- /** Length of SSID */ -- size_t ssid_len; --+ /** HT caapbilities */ --+ u16 ht_capab; -- /** Frequency of the channel in MHz (e.g., 2412 = channel 1) */ -- int freq; -- /** Beacon interval in TUs (host byte order) */ -diff --git a/package/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/hostapd/patches/380-disable_ctrl_iface_mib.patch -deleted file mode 100644 -index 27f21bd..0000000 ---- a/package/hostapd/patches/380-disable_ctrl_iface_mib.patch -+++ /dev/null -@@ -1,168 +0,0 @@ ----- a/hostapd/Makefile --+++ b/hostapd/Makefile --@@ -144,6 +144,9 @@ endif -- ifdef CONFIG_NO_CTRL_IFACE -- CFLAGS += -DCONFIG_NO_CTRL_IFACE -- else --+ifdef CONFIG_CTRL_IFACE_MIB --+CFLAGS += -DCONFIG_CTRL_IFACE_MIB --+endif -- OBJS += ctrl_iface.o -- OBJS += ../src/ap/ctrl_iface_ap.o -- endif ----- a/hostapd/ctrl_iface.c --+++ b/hostapd/ctrl_iface.c --@@ -1234,6 +1234,7 @@ static void hostapd_ctrl_iface_receive(i -- } else if (os_strcmp(buf, "STATUS") == 0) { -- reply_len = hostapd_ctrl_iface_status(hapd, reply, -- reply_size); --+#ifdef CONFIG_CTRL_IFACE_MIB -- } else if (os_strcmp(buf, "MIB") == 0) { -- reply_len = ieee802_11_get_mib(hapd, reply, reply_size); -- if (reply_len >= 0) { --@@ -1263,10 +1264,12 @@ static void hostapd_ctrl_iface_receive(i -- reply_len += res; -- } -- #endif /* CONFIG_NO_RADIUS */ --+#endif -- } else if (os_strcmp(buf, "DOWN") == 0) { -- hostapd_ctrl_iface_set_down(hapd); -- } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { -- hostapd_ctrl_iface_update(hapd, buf + 7); --+#ifdef CONFIG_CTRL_IFACE_MIB -- } else if (os_strcmp(buf, "STA-FIRST") == 0) { -- reply_len = hostapd_ctrl_iface_sta_first(hapd, reply, -- reply_size); --@@ -1276,6 +1279,7 @@ static void hostapd_ctrl_iface_receive(i -- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { -- reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply, -- reply_size); --+#endif -- } else if (os_strcmp(buf, "ATTACH") == 0) { -- if (hostapd_ctrl_iface_attach(hapd, &from, fromlen)) -- reply_len = -1; ----- a/wpa_supplicant/Makefile --+++ b/wpa_supplicant/Makefile --@@ -778,6 +778,9 @@ ifdef CONFIG_WNM -- OBJS += ../src/ap/wnm_ap.o -- endif -- ifdef CONFIG_CTRL_IFACE --+ifdef CONFIG_CTRL_IFACE_MIB --+CFLAGS += -DCONFIG_CTRL_IFACE_MIB --+endif -- OBJS += ../src/ap/ctrl_iface_ap.o -- endif -- ----- a/wpa_supplicant/ctrl_iface.c --+++ b/wpa_supplicant/ctrl_iface.c --@@ -5262,6 +5262,7 @@ char * wpa_supplicant_ctrl_iface_process -- reply_len = -1; -- } else if (os_strncmp(buf, "NOTE ", 5) == 0) { -- wpa_printf(MSG_INFO, "NOTE: %s", buf + 5); --+#ifdef CONFIG_CTRL_IFACE_MIB -- } else if (os_strcmp(buf, "MIB") == 0) { -- reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); -- if (reply_len >= 0) { --@@ -5273,6 +5274,7 @@ char * wpa_supplicant_ctrl_iface_process -- else -- reply_len += res; -- } --+#endif -- } else if (os_strncmp(buf, "STATUS", 6) == 0) { -- reply_len = wpa_supplicant_ctrl_iface_status( -- wpa_s, buf + 6, reply, reply_size); --@@ -5687,6 +5689,7 @@ char * wpa_supplicant_ctrl_iface_process -- reply_len = wpa_supplicant_ctrl_iface_bss( -- wpa_s, buf + 4, reply, reply_size); -- #ifdef CONFIG_AP --+#ifdef CONFIG_CTRL_IFACE_MIB -- } else if (os_strcmp(buf, "STA-FIRST") == 0) { -- reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); -- } else if (os_strncmp(buf, "STA ", 4) == 0) { --@@ -5695,6 +5698,7 @@ char * wpa_supplicant_ctrl_iface_process -- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { -- reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, -- reply_size); --+#endif -- } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) { -- if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15)) -- reply_len = -1; ----- a/src/ap/ctrl_iface_ap.c --+++ b/src/ap/ctrl_iface_ap.c --@@ -20,6 +20,7 @@ -- #include "ctrl_iface_ap.h" -- #include "ap_drv_ops.h" -- --+#ifdef CONFIG_CTRL_IFACE_MIB -- -- static int hostapd_get_sta_conn_time(struct sta_info *sta, -- char *buf, size_t buflen) --@@ -129,6 +130,7 @@ int hostapd_ctrl_iface_sta_next(struct h -- return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen); -- } -- --+#endif -- -- #ifdef CONFIG_P2P_MANAGER -- static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype, --@@ -423,3 +425,4 @@ int hostapd_parse_csa_settings(const cha -- -- return 0; -- } --+ ----- a/src/ap/ieee802_1x.c --+++ b/src/ap/ieee802_1x.c --@@ -1938,6 +1938,7 @@ static const char * bool_txt(Boolean boo -- return bool_val ? "TRUE" : "FALSE"; -- } -- --+#ifdef CONFIG_CTRL_IFACE_MIB -- -- int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen) -- { --@@ -2090,6 +2091,7 @@ int ieee802_1x_get_mib_sta(struct hostap -- return len; -- } -- --+#endif -- -- static void ieee802_1x_finished(struct hostapd_data *hapd, -- struct sta_info *sta, int success) ----- a/src/ap/wpa_auth.c --+++ b/src/ap/wpa_auth.c --@@ -2708,6 +2708,7 @@ static const char * wpa_bool_txt(int boo -- return bool ? "TRUE" : "FALSE"; -- } -- --+#ifdef CONFIG_CTRL_IFACE_MIB -- -- #define RSN_SUITE "%02x-%02x-%02x-%d" -- #define RSN_SUITE_ARG(s) \ --@@ -2852,7 +2853,7 @@ int wpa_get_mib_sta(struct wpa_state_mac -- -- return len; -- } --- --+#endif -- -- void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth) -- { ----- a/src/rsn_supp/wpa.c --+++ b/src/rsn_supp/wpa.c --@@ -1844,6 +1844,8 @@ static u32 wpa_key_mgmt_suite(struct wpa -- } -- -- --+#ifdef CONFIG_CTRL_IFACE_MIB --+ -- #define RSN_SUITE "%02x-%02x-%02x-%d" -- #define RSN_SUITE_ARG(s) \ -- ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff --@@ -1927,6 +1929,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch -- -- return (int) len; -- } --+#endif -- #endif /* CONFIG_CTRL_IFACE */ -- -- -diff --git a/package/hostapd/patches/390-wpa_ie_cap_workaround.patch b/package/hostapd/patches/390-wpa_ie_cap_workaround.patch -deleted file mode 100644 -index 00a3222..0000000 ---- a/package/hostapd/patches/390-wpa_ie_cap_workaround.patch -+++ /dev/null -@@ -1,56 +0,0 @@ ----- a/src/common/wpa_common.c --+++ b/src/common/wpa_common.c --@@ -959,6 +959,31 @@ const char * wpa_key_mgmt_txt(int key_mg -- } -- -- --+static void wpa_fixup_wpa_ie_rsn(u8 *assoc_ie, const u8 *wpa_msg_ie, --+ size_t rsn_ie_len) --+{ --+ int pos, count; --+ --+ pos = sizeof(struct rsn_ie_hdr) + RSN_SELECTOR_LEN; --+ if (rsn_ie_len < pos + 2) --+ return; --+ --+ count = WPA_GET_LE16(wpa_msg_ie + pos); --+ pos += 2 + count * RSN_SELECTOR_LEN; --+ if (rsn_ie_len < pos + 2) --+ return; --+ --+ count = WPA_GET_LE16(wpa_msg_ie + pos); --+ pos += 2 + count * RSN_SELECTOR_LEN; --+ if (rsn_ie_len < pos + 2) --+ return; --+ --+ if (!assoc_ie[pos] && !assoc_ie[pos + 1] && --+ (wpa_msg_ie[pos] || wpa_msg_ie[pos + 1])) --+ memcpy(&assoc_ie[pos], &wpa_msg_ie[pos], 2); --+} --+ --+ -- int wpa_compare_rsn_ie(int ft_initial_assoc, -- const u8 *ie1, size_t ie1len, -- const u8 *ie2, size_t ie2len) --@@ -966,8 +991,19 @@ int wpa_compare_rsn_ie(int ft_initial_as -- if (ie1 == NULL || ie2 == NULL) -- return -1; -- --- if (ie1len == ie2len && os_memcmp(ie1, ie2, ie1len) == 0) --- return 0; /* identical IEs */ --+ if (ie1len == ie2len) { --+ u8 *ie_tmp; --+ --+ if (os_memcmp(ie1, ie2, ie1len) == 0) --+ return 0; /* identical IEs */ --+ --+ ie_tmp = alloca(ie1len); --+ memcpy(ie_tmp, ie1, ie1len); --+ wpa_fixup_wpa_ie_rsn(ie_tmp, ie2, ie1len); --+ --+ if (os_memcmp(ie_tmp, ie2, ie1len) == 0) --+ return 0; /* only mismatch in RSN capabilties */ --+ } -- -- #ifdef CONFIG_IEEE80211R -- if (ft_initial_assoc) { -diff --git a/package/hostapd/patches/400-terminate_on_setup_failure.patch b/package/hostapd/patches/400-terminate_on_setup_failure.patch -deleted file mode 100644 -index 0d9065a..0000000 ---- a/package/hostapd/patches/400-terminate_on_setup_failure.patch -+++ /dev/null -@@ -1,85 +0,0 @@ ----- a/src/ap/hostapd.c --+++ b/src/ap/hostapd.c --@@ -1103,13 +1103,8 @@ int hostapd_setup_interface_complete(str -- size_t j; -- u8 *prev_addr; -- --- if (err) { --- wpa_printf(MSG_ERROR, "Interface initialization failed"); --- hostapd_set_state(iface, HAPD_IFACE_DISABLED); --- if (iface->interfaces && iface->interfaces->terminate_on_error) --- eloop_terminate(); --- return -1; --- } --+ if (err) --+ goto error; -- -- wpa_printf(MSG_DEBUG, "Completing interface initialization"); -- if (iface->conf->channel) { --@@ -1140,7 +1135,7 @@ int hostapd_setup_interface_complete(str -- hapd->iconf->vht_oper_centr_freq_seg1_idx)) { -- wpa_printf(MSG_ERROR, "Could not set channel for " -- "kernel driver"); --- return -1; --+ goto error; -- } -- } -- --@@ -1151,7 +1146,7 @@ int hostapd_setup_interface_complete(str -- hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, -- HOSTAPD_LEVEL_WARNING, -- "Failed to prepare rates table."); --- return -1; --+ goto error; -- } -- } -- --@@ -1159,14 +1154,14 @@ int hostapd_setup_interface_complete(str -- hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) { -- wpa_printf(MSG_ERROR, "Could not set RTS threshold for " -- "kernel driver"); --- return -1; --+ goto error; -- } -- -- if (hapd->iconf->fragm_threshold > -1 && -- hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) { -- wpa_printf(MSG_ERROR, "Could not set fragmentation threshold " -- "for kernel driver"); --- return -1; --+ goto error; -- } -- -- prev_addr = hapd->own_addr; --@@ -1176,7 +1171,7 @@ int hostapd_setup_interface_complete(str -- if (j) -- os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN); -- if (hostapd_setup_bss(hapd, j == 0)) --- return -1; --+ goto error; -- if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0) -- prev_addr = hapd->own_addr; -- } --@@ -1191,7 +1186,7 @@ int hostapd_setup_interface_complete(str -- if (hostapd_driver_commit(hapd) < 0) { -- wpa_printf(MSG_ERROR, "%s: Failed to commit driver " -- "configuration", __func__); --- return -1; --+ goto error; -- } -- -- /* --@@ -1216,6 +1211,13 @@ int hostapd_setup_interface_complete(str -- iface->interfaces->terminate_on_error--; -- -- return 0; --+ --+error: --+ wpa_printf(MSG_ERROR, "Interface initialization failed"); --+ hostapd_set_state(iface, HAPD_IFACE_DISABLED); --+ if (iface->interfaces && iface->interfaces->terminate_on_error) --+ eloop_terminate(); --+ return -1; -- } -- -- -diff --git a/package/hostapd/patches/410-bring_down_interface.patch b/package/hostapd/patches/410-bring_down_interface.patch -deleted file mode 100644 -index 31033a0..0000000 ---- a/package/hostapd/patches/410-bring_down_interface.patch -+++ /dev/null -@@ -1,25 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -8480,12 +8480,7 @@ static int wpa_driver_nl80211_set_mode(s -- /* Try to set the mode again while the interface is -- * down */ -- ret = nl80211_set_mode(drv, drv->ifindex, nlmode); --- if (ret == -EACCES) --- break; --- res = i802_set_iface_flags(bss, 1); --- if (res && !ret) --- ret = -1; --- else if (ret != -EBUSY) --+ if (ret != -EBUSY) -- break; -- } else -- wpa_printf(MSG_DEBUG, "nl80211: Failed to set " --@@ -8498,6 +8493,8 @@ static int wpa_driver_nl80211_set_mode(s -- "interface is down"); -- drv->nlmode = nlmode; -- drv->ignore_if_down_event = 1; --+ if (i802_set_iface_flags(bss, 1)) --+ ret = -1; -- } -- -- done: -diff --git a/package/hostapd/patches/420-fix_wps_pin_crash.patch b/package/hostapd/patches/420-fix_wps_pin_crash.patch -deleted file mode 100644 -index 130bd53..0000000 ---- a/package/hostapd/patches/420-fix_wps_pin_crash.patch -+++ /dev/null -@@ -1,12 +0,0 @@ ----- a/hostapd/ctrl_iface.c --+++ b/hostapd/ctrl_iface.c --@@ -480,6 +480,9 @@ static int hostapd_ctrl_iface_wps_ap_pin -- char *pos; -- const char *pin_txt; -- --+ if (!hapd->wps) --+ return -1; --+ -- pos = os_strchr(txt, ' '); -- if (pos) -- *pos++ = '\0'; -diff --git a/package/hostapd/patches/430-wps_single_auth_enc_type.patch b/package/hostapd/patches/430-wps_single_auth_enc_type.patch -deleted file mode 100644 -index 6e86658..0000000 ---- a/package/hostapd/patches/430-wps_single_auth_enc_type.patch -+++ /dev/null -@@ -1,25 +0,0 @@ ----- a/src/ap/wps_hostapd.c --+++ b/src/ap/wps_hostapd.c --@@ -1069,11 +1069,9 @@ int hostapd_init_wps(struct hostapd_data -- -- if (conf->rsn_pairwise & WPA_CIPHER_CCMP) -- wps->encr_types |= WPS_ENCR_AES; --- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) --+ else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) -- wps->encr_types |= WPS_ENCR_TKIP; --- } --- --- if (conf->wpa & WPA_PROTO_WPA) { --+ } else if (conf->wpa & WPA_PROTO_WPA) { -- if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) -- wps->auth_types |= WPS_AUTH_WPAPSK; -- if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X) --@@ -1081,7 +1079,7 @@ int hostapd_init_wps(struct hostapd_data -- -- if (conf->wpa_pairwise & WPA_CIPHER_CCMP) -- wps->encr_types |= WPS_ENCR_AES; --- if (conf->wpa_pairwise & WPA_CIPHER_TKIP) --+ else if (conf->wpa_pairwise & WPA_CIPHER_TKIP) -- wps->encr_types |= WPS_ENCR_TKIP; -- } -- -diff --git a/package/hostapd/patches/440-dynamic_20_40_mhz.patch b/package/hostapd/patches/440-dynamic_20_40_mhz.patch -deleted file mode 100644 -index 905ec2c..0000000 ---- a/package/hostapd/patches/440-dynamic_20_40_mhz.patch -+++ /dev/null -@@ -1,206 +0,0 @@ ----- a/hostapd/config_file.c --+++ b/hostapd/config_file.c --@@ -2422,6 +2422,10 @@ static int hostapd_config_fill(struct ho -- "ht_capab", line); -- errors++; -- } --+ } else if (os_strcmp(buf, "dynamic_ht40") == 0) { --+ conf->dynamic_ht40 = atoi(pos); --+ if (conf->dynamic_ht40 == 1) --+ conf->dynamic_ht40 = 1500; -- } else if (os_strcmp(buf, "require_ht") == 0) { -- conf->require_ht = atoi(pos); -- } else if (os_strcmp(buf, "obss_interval") == 0) { ----- a/src/ap/ap_config.h --+++ b/src/ap/ap_config.h --@@ -531,6 +531,7 @@ struct hostapd_config { -- int ieee80211n; -- int secondary_channel; -- int require_ht; --+ int dynamic_ht40; -- int obss_interval; -- u32 vht_capab; -- int ieee80211ac; ----- a/src/ap/hostapd.c --+++ b/src/ap/hostapd.c --@@ -23,6 +23,7 @@ -- #include "beacon.h" -- #include "iapp.h" -- #include "ieee802_1x.h" --+#include "ieee802_11.h" -- #include "ieee802_11_auth.h" -- #include "vlan_init.h" -- #include "wpa_auth.h" --@@ -332,6 +333,7 @@ static void hostapd_cleanup(struct hosta -- static void hostapd_cleanup_iface_partial(struct hostapd_iface *iface) -- { -- wpa_printf(MSG_DEBUG, "%s(%p)", __func__, iface); --+ hostapd_deinit_ht(iface); -- hostapd_free_hw_features(iface->hw_features, iface->num_hw_features); -- iface->hw_features = NULL; -- os_free(iface->current_rates); ----- a/src/ap/hostapd.h --+++ b/src/ap/hostapd.h --@@ -326,6 +326,9 @@ struct hostapd_iface { -- /* Overlapping BSS information */ -- int olbc_ht; -- --+ int force_20mhz; --+ struct os_time last_20mhz_trigger; --+ -- u16 ht_op_mode; -- -- /* surveying helpers */ ----- a/src/ap/ieee802_11.c --+++ b/src/ap/ieee802_11.c --@@ -1538,6 +1538,9 @@ static void handle_beacon(struct hostapd -- sizeof(mgmt->u.beacon)), &elems, -- 0); -- --+ if (!elems.ht_capabilities) --+ hostapd_trigger_20mhz(hapd->iface); --+ -- ap_list_process_beacon(hapd->iface, mgmt, &elems, fi); -- } -- ----- a/src/ap/ieee802_11.h --+++ b/src/ap/ieee802_11.h --@@ -82,4 +82,17 @@ int hostapd_update_time_adv(struct hosta -- void hostapd_client_poll_ok(struct hostapd_data *hapd, const u8 *addr); -- u8 * hostapd_eid_bss_max_idle_period(struct hostapd_data *hapd, u8 *eid); -- --+#ifdef CONFIG_IEEE80211N --+void hostapd_trigger_20mhz(struct hostapd_iface *iface); --+void hostapd_deinit_ht(struct hostapd_iface *iface); --+ --+#else --+static inline void hostapd_deinit_ht(struct hostapd_iface *iface) --+{ --+} --+static inline void hostapd_trigger_20mhz(struct hostapd_iface *iface) --+{ --+} --+#endif /* CONFIG_IEEE80211N */ --+ -- #endif /* IEEE802_11_H */ ----- a/src/ap/ieee802_11_ht.c --+++ b/src/ap/ieee802_11_ht.c --@@ -20,9 +20,11 @@ -- #include "drivers/driver.h" -- #include "hostapd.h" -- #include "ap_config.h" --+#include "ap_drv_ops.h" -- #include "sta_info.h" -- #include "beacon.h" -- #include "ieee802_11.h" --+#include "utils/eloop.h" -- -- -- u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid) --@@ -86,12 +88,15 @@ u8 * hostapd_eid_ht_operation(struct hos -- -- oper->control_chan = hapd->iconf->channel; -- oper->operation_mode = host_to_le16(hapd->iface->ht_op_mode); --- if (hapd->iconf->secondary_channel == 1) --- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | --- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --- if (hapd->iconf->secondary_channel == -1) --- oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | --- HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ --+ if (!hapd->iface->force_20mhz) { --+ if (hapd->iconf->secondary_channel == 1) --+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE | --+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ if (hapd->iconf->secondary_channel == -1) --+ oper->ht_param |= HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW | --+ HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH; --+ } -- -- pos += sizeof(*oper); -- --@@ -286,3 +291,84 @@ void hostapd_get_ht_capab(struct hostapd -- -- neg_ht_cap->ht_capabilities_info = host_to_le16(cap); -- } --+ --+static void hostapd_set_force_20mhz(struct hostapd_iface *iface); --+ --+static void hostapd_restore_40mhz(void *eloop_data, void *user_ctx) --+{ --+ struct hostapd_iface *iface = eloop_data; --+ struct os_time time; --+ int timeout; --+ --+ if (!iface->last_20mhz_trigger.sec) --+ return; --+ --+ os_get_time(&time); --+ timeout = iface->last_20mhz_trigger.sec + iface->conf->dynamic_ht40 - --+ time.sec; --+ --+ if (timeout > 0) { --+ eloop_register_timeout(timeout, 0, hostapd_restore_40mhz, --+ iface, NULL); --+ return; --+ } --+ --+ iface->last_20mhz_trigger.sec = 0; --+ iface->last_20mhz_trigger.usec = 0; --+ --+ iface->force_20mhz = 0; --+ hostapd_set_force_20mhz(iface); --+} --+ --+static void hostapd_set_force_20mhz(struct hostapd_iface *iface) --+{ --+ int secondary_channel; --+ int i; --+ --+ ieee802_11_set_beacons(iface); --+ --+ for (i = 0; i < iface->num_bss; i++) { --+ struct hostapd_data *hapd = iface->bss[i]; --+ --+ if (iface->force_20mhz) --+ secondary_channel = 0; --+ else --+ secondary_channel = hapd->iconf->secondary_channel; --+ --+ if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, iface->freq, --+ hapd->iconf->channel, --+ hapd->iconf->ieee80211n, --+ hapd->iconf->ieee80211ac, --+ secondary_channel, --+ hapd->iconf->vht_oper_chwidth, --+ hapd->iconf->vht_oper_centr_freq_seg0_idx, --+ hapd->iconf->vht_oper_centr_freq_seg1_idx)) { --+ wpa_printf(MSG_ERROR, "Could not set channel for " --+ "kernel driver"); --+ } --+ } --+} --+ --+void hostapd_deinit_ht(struct hostapd_iface *iface) --+{ --+ eloop_cancel_timeout(hostapd_restore_40mhz, iface, NULL); --+} --+ --+void hostapd_trigger_20mhz(struct hostapd_iface *iface) --+{ --+ if (!iface->conf->dynamic_ht40) --+ return; --+ --+ if (!iface->force_20mhz) { --+ iface->force_20mhz = 1; --+ hostapd_set_force_20mhz(iface); --+ } --+ --+ if (!iface->last_20mhz_trigger.sec) { --+ eloop_cancel_timeout(hostapd_restore_40mhz, iface, NULL); --+ eloop_register_timeout(iface->conf->dynamic_ht40, 0, --+ hostapd_restore_40mhz, iface, NULL); --+ } --+ --+ os_get_time(&iface->last_20mhz_trigger); --+} -diff --git a/package/hostapd/patches/450-limit_debug_messages.patch b/package/hostapd/patches/450-limit_debug_messages.patch -deleted file mode 100644 -index aaea941..0000000 ---- a/package/hostapd/patches/450-limit_debug_messages.patch -+++ /dev/null -@@ -1,213 +0,0 @@ ----- a/src/utils/wpa_debug.c --+++ b/src/utils/wpa_debug.c --@@ -201,7 +201,7 @@ void wpa_debug_close_linux_tracing(void) -- * -- * Note: New line '\n' is added to the end of the text when printing to stdout. -- */ ---void wpa_printf(int level, const char *fmt, ...) --+void _wpa_printf(int level, const char *fmt, ...) -- { -- va_list ap; -- --@@ -248,8 +248,8 @@ void wpa_printf(int level, const char *f -- } -- -- ---static void _wpa_hexdump(int level, const char *title, const u8 *buf, --- size_t len, int show) --+void _wpa_hexdump(int level, const char *title, const u8 *buf, --+ size_t len, int show) -- { -- size_t i; -- --@@ -375,20 +375,9 @@ static void _wpa_hexdump(int level, cons -- #endif /* CONFIG_ANDROID_LOG */ -- } -- ---void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len) ---{ --- _wpa_hexdump(level, title, buf, len, 1); ---} --- --- ---void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len) ---{ --- _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys); ---} -- --- ---static void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, --- size_t len, int show) --+void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, --+ size_t len, int show) -- { -- size_t i, llen; -- const u8 *pos = buf; --@@ -495,19 +484,6 @@ static void _wpa_hexdump_ascii(int level -- } -- -- ---void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len) ---{ --- _wpa_hexdump_ascii(level, title, buf, len, 1); ---} --- --- ---void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, --- size_t len) ---{ --- _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys); ---} --- --- -- #ifdef CONFIG_DEBUG_FILE -- static char *last_path = NULL; -- #endif /* CONFIG_DEBUG_FILE */ --@@ -591,7 +567,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_ -- } -- -- ---void wpa_msg(void *ctx, int level, const char *fmt, ...) --+void _wpa_msg(void *ctx, int level, const char *fmt, ...) -- { -- va_list ap; -- char *buf; --@@ -625,7 +601,7 @@ void wpa_msg(void *ctx, int level, const -- } -- -- ---void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...) --+void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...) -- { -- va_list ap; -- char *buf; ----- a/src/utils/wpa_debug.h --+++ b/src/utils/wpa_debug.h --@@ -43,6 +43,17 @@ int wpa_debug_open_file(const char *path -- int wpa_debug_reopen_file(void); -- void wpa_debug_close_file(void); -- --+/* internal */ --+void _wpa_hexdump(int level, const char *title, const u8 *buf, --+ size_t len, int show); --+void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf, --+ size_t len, int show); --+extern int wpa_debug_show_keys; --+ --+#ifndef CONFIG_MSG_MIN_PRIORITY --+#define CONFIG_MSG_MIN_PRIORITY 0 --+#endif --+ -- /** -- * wpa_debug_printf_timestamp - Print timestamp for debug output -- * --@@ -63,9 +74,15 @@ void wpa_debug_print_timestamp(void); -- * -- * Note: New line '\n' is added to the end of the text when printing to stdout. -- */ ---void wpa_printf(int level, const char *fmt, ...) --+void _wpa_printf(int level, const char *fmt, ...) -- PRINTF_FORMAT(2, 3); -- --+#define wpa_printf(level, ...) \ --+ do { \ --+ if (level >= CONFIG_MSG_MIN_PRIORITY) \ --+ _wpa_printf(level, __VA_ARGS__); \ --+ } while(0) --+ -- /** -- * wpa_hexdump - conditional hex dump -- * @level: priority level (MSG_*) of the message --@@ -77,7 +94,13 @@ PRINTF_FORMAT(2, 3); -- * output may be directed to stdout, stderr, and/or syslog based on -- * configuration. The contents of buf is printed out has hex dump. -- */ ---void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len); --+static inline void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len) --+{ --+ if (level < CONFIG_MSG_MIN_PRIORITY) --+ return; --+ --+ _wpa_hexdump(level, title, buf, len, 1); --+} -- -- static inline void wpa_hexdump_buf(int level, const char *title, -- const struct wpabuf *buf) --@@ -99,7 +122,13 @@ static inline void wpa_hexdump_buf(int l -- * like wpa_hexdump(), but by default, does not include secret keys (passwords, -- * etc.) in debug output. -- */ ---void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len); --+static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len) --+{ --+ if (level < CONFIG_MSG_MIN_PRIORITY) --+ return; --+ --+ _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys); --+} -- -- static inline void wpa_hexdump_buf_key(int level, const char *title, -- const struct wpabuf *buf) --@@ -121,8 +150,14 @@ static inline void wpa_hexdump_buf_key(i -- * the hex numbers and ASCII characters (for printable range) are shown. 16 -- * bytes per line will be shown. -- */ ---void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, --- size_t len); --+static inline void wpa_hexdump_ascii(int level, const char *title, --+ const u8 *buf, size_t len) --+{ --+ if (level < CONFIG_MSG_MIN_PRIORITY) --+ return; --+ --+ _wpa_hexdump_ascii(level, title, buf, len, 1); --+} -- -- /** -- * wpa_hexdump_ascii_key - conditional hex dump, hide keys --@@ -138,8 +173,14 @@ void wpa_hexdump_ascii(int level, const -- * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by -- * default, does not include secret keys (passwords, etc.) in debug output. -- */ ---void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, --- size_t len); --+static inline void wpa_hexdump_ascii_key(int level, const char *title, --+ const u8 *buf, size_t len) --+{ --+ if (level < CONFIG_MSG_MIN_PRIORITY) --+ return; --+ --+ _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys); --+} -- -- /* -- * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce --@@ -174,7 +215,12 @@ void wpa_hexdump_ascii_key(int level, co -- * -- * Note: New line '\n' is added to the end of the text when printing to stdout. -- */ ---void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4); --+void _wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4); --+#define wpa_msg(ctx, level, ...) \ --+ do { \ --+ if (level >= CONFIG_MSG_MIN_PRIORITY) \ --+ _wpa_msg(ctx, level, __VA_ARGS__); \ --+ } while(0) -- -- /** -- * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors --@@ -188,8 +234,13 @@ void wpa_msg(void *ctx, int level, const -- * attached ctrl_iface monitors. In other words, it can be used for frequent -- * events that do not need to be sent to syslog. -- */ ---void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...) --+void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...) -- PRINTF_FORMAT(3, 4); --+#define wpa_msg_ctrl(ctx, level, ...) \ --+ do { \ --+ if (level >= CONFIG_MSG_MIN_PRIORITY) \ --+ _wpa_msg_ctrl(ctx, level, __VA_ARGS__); \ --+ } while(0) -- -- /** -- * wpa_msg_global - Global printf for ctrl_iface monitors -diff --git a/package/hostapd/patches/460-indicate-features.patch b/package/hostapd/patches/460-indicate-features.patch -deleted file mode 100644 -index 7a44da1..0000000 ---- a/package/hostapd/patches/460-indicate-features.patch -+++ /dev/null -@@ -1,82 +0,0 @@ ----- a/hostapd/main.c --+++ b/hostapd/main.c --@@ -14,6 +14,7 @@ -- -- #include "utils/common.h" -- #include "utils/eloop.h" --+#include "utils/build_features.h" -- #include "crypto/random.h" -- #include "crypto/tls.h" -- #include "common/version.h" --@@ -546,7 +547,7 @@ int main(int argc, char *argv[]) -- -- wpa_supplicant_event = hostapd_wpa_event; -- for (;;) { --- c = getopt(argc, argv, "b:Bde:f:hKP:Ttvg:G:"); --+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttg:G:v::"); -- if (c < 0) -- break; -- switch (c) { --@@ -583,6 +584,8 @@ int main(int argc, char *argv[]) -- break; -- #endif /* CONFIG_DEBUG_LINUX_TRACING */ -- case 'v': --+ if (optarg) --+ exit(!has_feature(optarg)); -- show_version(); -- exit(1); -- break; ----- a/wpa_supplicant/main.c --+++ b/wpa_supplicant/main.c --@@ -12,6 +12,7 @@ -- #endif /* __linux__ */ -- -- #include "common.h" --+#include "build_features.h" -- #include "wpa_supplicant_i.h" -- #include "driver_i.h" -- #include "p2p_supplicant.h" --@@ -161,7 +162,7 @@ int main(int argc, char *argv[]) -- -- for (;;) { -- c = getopt(argc, argv, --- "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuvW"); --+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLNo:O:p:P:qsTtuv::W"); -- if (c < 0) -- break; -- switch (c) { --@@ -259,8 +260,12 @@ int main(int argc, char *argv[]) -- break; -- #endif /* CONFIG_DBUS */ -- case 'v': --- printf("%s\n", wpa_supplicant_version); --- exitcode = 0; --+ if (optarg) { --+ exitcode = !has_feature(optarg); --+ } else { --+ printf("%s\n", wpa_supplicant_version); --+ exitcode = 0; --+ } -- goto out; -- case 'W': -- params.wait_for_monitor++; ----- /dev/null --+++ b/src/utils/build_features.h --@@ -0,0 +1,17 @@ --+#ifndef BUILD_FEATURES_H --+#define BUILD_FEATURES_H --+ --+static inline int has_feature(const char *feat) --+{ --+#ifdef IEEE8021X_EAPOL --+ if (!strcmp(feat, "eap")) --+ return 1; --+#endif --+#ifdef IEEE80211N --+ if (!strcmp(feat, "11n")) --+ return 1; --+#endif --+ return 0; --+} --+ --+#endif /* BUILD_FEATURES_H */ -diff --git a/package/hostapd/patches/470-hostapd_cli_ifdef.patch b/package/hostapd/patches/470-hostapd_cli_ifdef.patch -deleted file mode 100644 -index 5ac0fdd..0000000 ---- a/package/hostapd/patches/470-hostapd_cli_ifdef.patch -+++ /dev/null -@@ -1,50 +0,0 @@ ----- a/hostapd/hostapd_cli.c --+++ b/hostapd/hostapd_cli.c --@@ -67,7 +67,6 @@ static const char *commands_help = -- #ifdef CONFIG_IEEE80211W -- " sa_query send SA Query to a station\n" -- #endif /* CONFIG_IEEE80211W */ ---#ifdef CONFIG_WPS -- " wps_pin [timeout] [addr] add WPS Enrollee PIN\n" -- " wps_check_pin verify PIN checksum\n" -- " wps_pbc indicate button pushed to initiate PBC\n" --@@ -80,7 +79,6 @@ static const char *commands_help = -- " wps_ap_pin [params..] enable/disable AP PIN\n" -- " wps_config configure AP\n" -- " wps_get_status show current WPS status\n" ---#endif /* CONFIG_WPS */ -- " get_config show current configuration\n" -- " help show this usage help\n" -- " interface [ifname] show interfaces/select interface\n" --@@ -352,7 +350,6 @@ static int hostapd_cli_cmd_sa_query(stru -- #endif /* CONFIG_IEEE80211W */ -- -- ---#ifdef CONFIG_WPS -- static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc, -- char *argv[]) -- { --@@ -578,7 +575,6 @@ static int hostapd_cli_cmd_wps_config(st -- ssid_hex, argv[1]); -- return wpa_ctrl_command(ctrl, buf); -- } ---#endif /* CONFIG_WPS */ -- -- -- static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc, --@@ -903,7 +899,6 @@ static struct hostapd_cli_cmd hostapd_cl -- #ifdef CONFIG_IEEE80211W -- { "sa_query", hostapd_cli_cmd_sa_query }, -- #endif /* CONFIG_IEEE80211W */ ---#ifdef CONFIG_WPS -- { "wps_pin", hostapd_cli_cmd_wps_pin }, -- { "wps_check_pin", hostapd_cli_cmd_wps_check_pin }, -- { "wps_pbc", hostapd_cli_cmd_wps_pbc }, --@@ -917,7 +912,6 @@ static struct hostapd_cli_cmd hostapd_cl -- { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin }, -- { "wps_config", hostapd_cli_cmd_wps_config }, -- { "wps_get_status", hostapd_cli_cmd_wps_get_status }, ---#endif /* CONFIG_WPS */ -- { "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent }, -- { "ess_disassoc", hostapd_cli_cmd_ess_disassoc }, -- { "get_config", hostapd_cli_cmd_get_config }, -diff --git a/package/hostapd/patches/471-wpa_cli_ifdef.patch b/package/hostapd/patches/471-wpa_cli_ifdef.patch -deleted file mode 100644 -index cc84444..0000000 ---- a/package/hostapd/patches/471-wpa_cli_ifdef.patch -+++ /dev/null -@@ -1,13 +0,0 @@ ----- a/wpa_supplicant/wpa_cli.c --+++ b/wpa_supplicant/wpa_cli.c --@@ -26,6 +26,10 @@ -- #endif /* ANDROID */ -- -- --+#ifndef CONFIG_P2P --+#define CONFIG_P2P --+#endif --+ -- static const char *wpa_cli_version = -- "wpa_cli v" VERSION_STR "\n" -- "Copyright (c) 2004-2013, Jouni Malinen and contributors"; -diff --git a/package/hostapd/patches/480-max_num_sta_probe.patch b/package/hostapd/patches/480-max_num_sta_probe.patch -deleted file mode 100644 -index e5ca8b4..0000000 ---- a/package/hostapd/patches/480-max_num_sta_probe.patch -+++ /dev/null -@@ -1,13 +0,0 @@ ----- a/src/ap/beacon.c --+++ b/src/ap/beacon.c --@@ -501,6 +501,10 @@ void handle_probe_req(struct hostapd_dat -- return; -- } -- --+ if (!sta && hapd->num_sta >= hapd->conf->max_num_sta) --+ wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR " ignored," --+ " too many connected stations.", MAC2STR(mgmt->sa)); --+ -- #ifdef CONFIG_INTERWORKING -- if (elems.interworking && elems.interworking_len >= 1) { -- u8 ant = elems.interworking[0] & 0x0f; -diff --git a/package/hostapd/patches/490-scan_wait.patch b/package/hostapd/patches/490-scan_wait.patch -deleted file mode 100644 -index 61715d6..0000000 ---- a/package/hostapd/patches/490-scan_wait.patch -+++ /dev/null -@@ -1,66 +0,0 @@ ----- a/hostapd/main.c --+++ b/hostapd/main.c --@@ -33,6 +33,8 @@ -- extern int wpa_debug_level; -- extern int wpa_debug_show_keys; -- extern int wpa_debug_timestamp; --+static int daemonize = 0; --+static char *pid_file = NULL; -- -- extern struct wpa_driver_ops *wpa_drivers[]; -- --@@ -147,6 +149,14 @@ static void hostapd_logger_cb(void *ctx, -- } -- #endif /* CONFIG_NO_HOSTAPD_LOGGER */ -- --+static void hostapd_setup_complete_cb(void *ctx) --+{ --+ if (daemonize && os_daemonize(pid_file)) { --+ perror("daemon"); --+ return; --+ } --+ daemonize = 0; --+} -- -- /** -- * hostapd_driver_init - Preparate driver interface --@@ -165,6 +175,8 @@ static int hostapd_driver_init(struct ho -- return -1; -- } -- --+ hapd->setup_complete_cb = hostapd_setup_complete_cb; --+ -- /* Initialize the driver interface */ -- if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) -- b = NULL; --@@ -381,8 +393,6 @@ static void hostapd_global_deinit(const -- #endif /* CONFIG_NATIVE_WINDOWS */ -- -- eap_server_unregister_methods(); --- --- os_daemonize_terminate(pid_file); -- } -- -- --@@ -408,11 +418,6 @@ static int hostapd_global_run(struct hap -- } -- #endif /* EAP_SERVER_TNC */ -- --- if (daemonize && os_daemonize(pid_file)) { --- perror("daemon"); --- return -1; --- } --- -- eloop_run(); -- -- return 0; --@@ -521,8 +526,7 @@ int main(int argc, char *argv[]) -- struct hapd_interfaces interfaces; -- int ret = 1; -- size_t i, j; --- int c, debug = 0, daemonize = 0; --- char *pid_file = NULL; --+ int c, debug = 0; -- const char *log_file = NULL; -- const char *entropy_file = NULL; -- char **bss_config = NULL, **tmp_bss; -diff --git a/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch -deleted file mode 100644 -index 544151e..0000000 ---- a/package/hostapd/patches/500-wpa_supplicant-add-new-config-params-to-be-used-with.patch -+++ /dev/null -@@ -1,209 +0,0 @@ --From 4bb69d15477e0f2b00e166845341dc933de47c58 Mon Sep 17 00:00:00 2001 --From: Antonio Quartulli --Date: Sun, 3 Jun 2012 18:22:56 +0200 --Subject: [PATCHv2 601/602] wpa_supplicant: add new config params to be used -- with the ibss join command -- --Signed-hostap: Antonio Quartulli ----- -- src/drivers/driver.h | 6 +++ -- wpa_supplicant/config.c | 96 +++++++++++++++++++++++++++++++++++++++ -- wpa_supplicant/config_ssid.h | 6 +++ -- wpa_supplicant/wpa_supplicant.c | 23 +++++++--- -- 4 files changed, 124 insertions(+), 7 deletions(-) -- ----- a/src/drivers/driver.h --+++ b/src/drivers/driver.h --@@ -19,6 +19,7 @@ -- -- #define WPA_SUPPLICANT_DRIVER_VERSION 4 -- --+#include "drivers/nl80211_copy.h" -- #include "common/defs.h" -- #include "utils/list.h" -- --@@ -404,6 +405,11 @@ struct wpa_driver_associate_params { -- */ -- int freq; -- --+ int beacon_interval; --+ int fixed_freq; --+ unsigned char rates[NL80211_MAX_SUPP_RATES]; --+ int mcast_rate; --+ -- /** -- * bg_scan_period - Background scan period in seconds, 0 to disable -- * background scan, or -1 to indicate no change to default driver ----- a/wpa_supplicant/config.c --+++ b/wpa_supplicant/config.c --@@ -14,6 +14,7 @@ -- #include "rsn_supp/wpa.h" -- #include "eap_peer/eap.h" -- #include "p2p/p2p.h" --+#include "drivers/nl80211_copy.h" -- #include "config.h" -- -- --@@ -1512,6 +1513,97 @@ static char * wpa_config_write_psk_list( -- -- #endif /* CONFIG_P2P */ -- --+static int wpa_config_parse_mcast_rate(const struct parse_data *data, --+ struct wpa_ssid *ssid, int line, --+ const char *value) --+{ --+ ssid->mcast_rate = (int)(strtod(value, NULL) * 10); --+ --+ return 0; --+} --+ --+#ifndef NO_CONFIG_WRITE --+static char * wpa_config_write_mcast_rate(const struct parse_data *data, --+ struct wpa_ssid *ssid) --+{ --+ char *value; --+ int res; --+ --+ if (!ssid->mcast_rate == 0) --+ return NULL; --+ --+ value = os_malloc(6); /* longest: 300.0 */ --+ if (value == NULL) --+ return NULL; --+ res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10); --+ if (res < 0) { --+ os_free(value); --+ return NULL; --+ } --+ return value; --+} --+#endif /* NO_CONFIG_WRITE */ --+ --+static int wpa_config_parse_rates(const struct parse_data *data, --+ struct wpa_ssid *ssid, int line, --+ const char *value) --+{ --+ int i; --+ char *pos, *r, *sptr, *end; --+ double rate; --+ --+ pos = (char *)value; --+ r = strtok_r(pos, ",", &sptr); --+ i = 0; --+ while (pos && i < NL80211_MAX_SUPP_RATES) { --+ rate = 0.0; --+ if (r) --+ rate = strtod(r, &end); --+ ssid->rates[i] = rate * 2; --+ if (*end != '\0' || rate * 2 != ssid->rates[i]) --+ return 1; --+ --+ i++; --+ r = strtok_r(NULL, ",", &sptr); --+ } --+ --+ return 0; --+} --+ --+#ifndef NO_CONFIG_WRITE --+static char * wpa_config_write_rates(const struct parse_data *data, --+ struct wpa_ssid *ssid) --+{ --+ char *value, *pos; --+ int res, i; --+ --+ if (ssid->rates[0] <= 0) --+ return NULL; --+ --+ value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1); --+ if (value == NULL) --+ return NULL; --+ pos = value; --+ for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) { --+ res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2); --+ if (res < 0) { --+ os_free(value); --+ return NULL; --+ } --+ pos += res; --+ } --+ res = os_snprintf(pos, 6, "%.1f", --+ (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2); --+ if (res < 0) { --+ os_free(value); --+ return NULL; --+ } --+ --+ value[6 * NL80211_MAX_SUPP_RATES] = '\0'; --+ return value; --+} --+#endif /* NO_CONFIG_WRITE */ --+ -- /* Helper macros for network block parser */ -- -- #ifdef OFFSET --@@ -1715,6 +1807,9 @@ static const struct parse_data ssid_fiel -- { INT(ap_max_inactivity) }, -- { INT(dtim_period) }, -- { INT(beacon_int) }, --+ { INT_RANGE(fixed_freq, 0, 1) }, --+ { FUNC(rates) }, --+ { FUNC(mcast_rate) }, -- }; -- -- #undef OFFSET ----- a/wpa_supplicant/config_ssid.h --+++ b/wpa_supplicant/config_ssid.h --@@ -12,6 +12,7 @@ -- #include "common/defs.h" -- #include "utils/list.h" -- #include "eap_peer/eap_config.h" --+#include "drivers/nl80211_copy.h" -- -- #define MAX_SSID_LEN 32 -- --@@ -620,6 +621,10 @@ struct wpa_ssid { -- * dereferences since it may not be updated in all cases. -- */ -- void *parent_cred; --+ --+ int fixed_freq; --+ unsigned char rates[NL80211_MAX_SUPP_RATES]; --+ double mcast_rate; -- }; -- -- #endif /* CONFIG_SSID_H */ ----- a/wpa_supplicant/wpa_supplicant.c --+++ b/wpa_supplicant/wpa_supplicant.c --@@ -1623,15 +1623,24 @@ void wpa_supplicant_associate(struct wpa -- params.ssid_len = ssid->ssid_len; -- } -- --- if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set && --- wpa_s->conf->ap_scan == 2) { --- params.bssid = ssid->bssid; --- params.fixed_bssid = 1; --+ if (ssid->mode == WPAS_MODE_IBSS) { --+ if (ssid->bssid_set && wpa_s->conf->ap_scan == 2) { --+ params.bssid = ssid->bssid; --+ params.fixed_bssid = 1; --+ } --+ if (ssid->frequency > 0 && params.freq == 0) --+ /* Initial channel for IBSS */ --+ params.freq = ssid->frequency; --+ params.fixed_freq = ssid->fixed_freq; --+ params.beacon_interval = ssid->beacon_int; --+ i = 0; --+ while (i < NL80211_MAX_SUPP_RATES) { --+ params.rates[i] = ssid->rates[i]; --+ i++; --+ } --+ params.mcast_rate = ssid->mcast_rate; -- } -- --- if (ssid->mode == WPAS_MODE_IBSS && ssid->frequency > 0 && --- params.freq == 0) --- params.freq = ssid->frequency; /* Initial channel for IBSS */ -- params.wpa_ie = wpa_ie; -- params.wpa_ie_len = wpa_ie_len; -- params.pairwise_suite = cipher_pairwise; -diff --git a/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch -deleted file mode 100644 -index 565bbc9..0000000 ---- a/package/hostapd/patches/501-driver_nl80211-use-new-parameters-during-ibss-join.patch -+++ /dev/null -@@ -1,59 +0,0 @@ --From ffc4445958a3ed4064f2e1bf73fa478a61c5cf7b Mon Sep 17 00:00:00 2001 --From: Antonio Quartulli --Date: Sun, 3 Jun 2012 18:42:25 +0200 --Subject: [PATCHv2 602/602] driver_nl80211: use new parameters during ibss join -- --Signed-hostap: Antonio Quartulli ----- -- src/drivers/driver_nl80211.c | 33 ++++++++++++++++++++++++++++++++- -- 1 file changed, 32 insertions(+), 1 deletion(-) -- ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -7903,7 +7903,7 @@ static int wpa_driver_nl80211_ibss(struc -- struct wpa_driver_associate_params *params) -- { -- struct nl_msg *msg; --- int ret = -1; --+ int ret = -1, i; -- int count = 0; -- -- wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); --@@ -7936,6 +7936,37 @@ retry: -- wpa_printf(MSG_DEBUG, " * freq=%d", params->freq); -- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq); -- --+ if (params->fixed_freq) { --+ wpa_printf(MSG_DEBUG, " * fixed_freq"); --+ NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED); --+ } --+ --+ if (params->beacon_interval > 0) { --+ wpa_printf(MSG_DEBUG, " * beacon_interval=%d", --+ params->beacon_interval); --+ NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, --+ params->beacon_interval); --+ } --+ --+ if (params->rates[0] > 0) { --+ wpa_printf(MSG_DEBUG, " * basic_rates:"); --+ i = 0; --+ while (i < NL80211_MAX_SUPP_RATES && --+ params->rates[i] > 0) { --+ wpa_printf(MSG_DEBUG, " %.1f", --+ (double)params->rates[i] / 2); --+ i++; --+ } --+ NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, i, --+ params->rates); --+ } --+ --+ if (params->mcast_rate > 0) { --+ wpa_printf(MSG_DEBUG, " * mcast_rates=%.1f", --+ (double)params->mcast_rate / 10); --+ NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); --+ } --+ -- ret = nl80211_set_conn_keys(params, msg); -- if (ret) -- goto nla_put_failure; -diff --git a/package/hostapd/patches/502-wpa_s-support-htmode-param.patch b/package/hostapd/patches/502-wpa_s-support-htmode-param.patch -deleted file mode 100644 -index adb20a2..0000000 ---- a/package/hostapd/patches/502-wpa_s-support-htmode-param.patch -+++ /dev/null -@@ -1,156 +0,0 @@ --From b9329c5dfeed7d5c55d2117d8dfe326fc40c8fb1 Mon Sep 17 00:00:00 2001 --From: Antonio Quartulli --Date: Tue, 3 Jul 2012 00:36:24 +0200 --Subject: [PATCH] wpa_s: support htmode param -- --possible values are HT20, HT40-, HT40+ and NOHT -- --Signed-off-by: Antonio Quartulli ----- -- src/drivers/driver.h | 2 ++ -- src/drivers/driver_nl80211.c | 16 ++++++++++ -- wpa_supplicant/config.c | 66 +++++++++++++++++++++++++++++++++++++++ -- wpa_supplicant/config_ssid.h | 2 ++ -- wpa_supplicant/wpa_supplicant.c | 2 ++ -- 5 files changed, 88 insertions(+) -- ----- a/src/drivers/driver.h --+++ b/src/drivers/driver.h --@@ -409,6 +409,8 @@ struct wpa_driver_associate_params { -- int fixed_freq; -- unsigned char rates[NL80211_MAX_SUPP_RATES]; -- int mcast_rate; --+ int ht_set; --+ unsigned int htmode; -- -- /** -- * bg_scan_period - Background scan period in seconds, 0 to disable ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -7967,6 +7967,22 @@ retry: -- NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate); -- } -- --+ if (params->ht_set) { --+ switch(params->htmode) { --+ case NL80211_CHAN_HT20: --+ wpa_printf(MSG_DEBUG, " * ht=HT20"); --+ break; --+ case NL80211_CHAN_HT40PLUS: --+ wpa_printf(MSG_DEBUG, " * ht=HT40+"); --+ break; --+ case NL80211_CHAN_HT40MINUS: --+ wpa_printf(MSG_DEBUG, " * ht=HT40-"); --+ break; --+ } --+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, --+ params->htmode); --+ } --+ -- ret = nl80211_set_conn_keys(params, msg); -- if (ret) -- goto nla_put_failure; ----- a/wpa_supplicant/config.c --+++ b/wpa_supplicant/config.c --@@ -1544,6 +1544,71 @@ static char * wpa_config_write_mcast_rat -- } -- #endif /* NO_CONFIG_WRITE */ -- --+static int wpa_config_parse_htmode(const struct parse_data *data, --+ struct wpa_ssid *ssid, int line, --+ const char *value) --+{ --+ int i; --+ static const struct { --+ const char *name; --+ unsigned int val; --+ } htmap[] = { --+ { .name = "HT20", .val = NL80211_CHAN_HT20, }, --+ { .name = "HT40+", .val = NL80211_CHAN_HT40PLUS, }, --+ { .name = "HT40-", .val = NL80211_CHAN_HT40MINUS, }, --+ { .name = "NOHT", .val = NL80211_CHAN_NO_HT, }, --+ }; --+ ssid->ht_set = 0;; --+ for (i = 0; i < 4; i++) { --+ if (strcasecmp(htmap[i].name, value) == 0) { --+ ssid->htmode = htmap[i].val; --+ ssid->ht_set = 1; --+ break; --+ } --+ } --+ --+ return 0; --+} --+ --+#ifndef NO_CONFIG_WRITE --+static char * wpa_config_write_htmode(const struct parse_data *data, --+ struct wpa_ssid *ssid) --+{ --+ char *value; --+ int res; --+ --+ value = os_malloc(6); /* longest: HT40+ */ --+ if (value == NULL) --+ return NULL; --+ --+ switch(ssid->htmode) { --+ case NL80211_CHAN_HT20: --+ res = os_snprintf(value, 4, "HT20"); --+ break; --+ case NL80211_CHAN_HT40PLUS: --+ res = os_snprintf(value, 5, "HT40+"); --+ break; --+ case NL80211_CHAN_HT40MINUS: --+ res = os_snprintf(value, 5, "HT40-"); --+ break; --+ case NL80211_CHAN_NO_HT: --+ res = os_snprintf(value, 4, "NOHT"); --+ break; --+ default: --+ os_free(value); --+ return NULL; --+ } --+ --+ if (res < 0) { --+ os_free(value); --+ return NULL; --+ } --+ --+ return value; --+} --+#endif /* NO_CONFIG_WRITE */ --+ --+ -- static int wpa_config_parse_rates(const struct parse_data *data, -- struct wpa_ssid *ssid, int line, -- const char *value) --@@ -1810,6 +1875,7 @@ static const struct parse_data ssid_fiel -- { INT_RANGE(fixed_freq, 0, 1) }, -- { FUNC(rates) }, -- { FUNC(mcast_rate) }, --+ { FUNC(htmode) }, -- }; -- -- #undef OFFSET ----- a/wpa_supplicant/config_ssid.h --+++ b/wpa_supplicant/config_ssid.h --@@ -625,6 +625,8 @@ struct wpa_ssid { -- int fixed_freq; -- unsigned char rates[NL80211_MAX_SUPP_RATES]; -- double mcast_rate; --+ int ht_set; --+ unsigned int htmode; -- }; -- -- #endif /* CONFIG_SSID_H */ ----- a/wpa_supplicant/wpa_supplicant.c --+++ b/wpa_supplicant/wpa_supplicant.c --@@ -1639,6 +1639,8 @@ void wpa_supplicant_associate(struct wpa -- i++; -- } -- params.mcast_rate = ssid->mcast_rate; --+ params.ht_set = ssid->ht_set; --+ params.htmode = ssid->htmode; -- } -- -- params.wpa_ie = wpa_ie; -diff --git a/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch b/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch -deleted file mode 100644 -index fe72ee2..0000000 ---- a/package/hostapd/patches/510-wpa_supplicant_p2p_parse_ifcomb.patch -+++ /dev/null -@@ -1,18 +0,0 @@ ----- a/src/drivers/driver_nl80211.c --+++ b/src/drivers/driver_nl80211.c --@@ -3157,10 +3157,12 @@ static int wiphy_info_iface_comb_process -- } -- -- if (combination_has_p2p && combination_has_mgd) { --- info->p2p_concurrent = 1; --- info->num_multichan_concurrent = --+ int num_channels = -- nla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]); --- return 1; --+ --+ info->p2p_concurrent = 1; --+ if (info->num_multichan_concurrent < num_channels) --+ info->num_multichan_concurrent = num_channels; -- } -- -- return 0; -diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile -deleted file mode 100644 -index d9149d9..0000000 ---- a/package/mac80211/Makefile -+++ /dev/null -@@ -1,1856 +0,0 @@ --# --# Copyright (C) 2007-2013 OpenWrt.org --# --# This is free software, licensed under the GNU General Public License v2. --# See /LICENSE for more information. --# -- --include $(TOPDIR)/rules.mk --include $(INCLUDE_DIR)/kernel.mk -- --PKG_NAME:=mac80211 -- --PKG_VERSION:=2014-01-23.1 --PKG_RELEASE:=1 --PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources --PKG_BACKPORT_VERSION:= --PKG_MD5SUM:=8db16edbdaf4abc2e9c2f3b6c86736a6 -- --PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2 --PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) --PKG_BUILD_PARALLEL:=1 -- --PKG_MAINTAINER:=Felix Fietkau -- --PKG_DRIVERS = \ -- adm8211 ath5k libertas-usb libertas-sd p54-common p54-pci p54-usb p54-spi \ -- rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \ -- rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb rt2800-soc \ -- rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \ -- ath9k-common ath9k ath9k-htc ath10k ath net-libipw net-ipw2100 net-ipw2200 \ -- mwl8k net-hermes net-hermes-pci net-hermes-plx net-hermes-pcmcia \ -- iwl-legacy iwl3945 iwl4965 iwlagn wlcore wl12xx wl18xx lib80211 \ -- rtlwifi rtlwifi-pci rtlwifi-usb rtl8192c-common rtl8192ce rtl8192se \ -- rtl8192de rtl8192cu -- --PKG_CONFIG_DEPENDS:= \ -- CONFIG_PACKAGE_kmod-mac80211 \ -- $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \ -- CONFIG_PACKAGE_MAC80211_DEBUGFS \ -- CONFIG_PACKAGE_MAC80211_MESH \ -- CONFIG_PACKAGE_ATH_DEBUG \ -- CONFIG_PACKAGE_B43_DEBUG \ -- CONFIG_PACKAGE_B43_PIO \ -- CONFIG_PACKAGE_B43_N_PHY \ -- CONFIG_PACKAGE_RTLWIFI_DEBUG \ -- CONFIG_ATH_USER_REGD \ -- --include $(INCLUDE_DIR)/package.mk -- --WMENU:=Wireless Drivers -- --define KernelPackage/mac80211/Default -- SUBMENU:=$(WMENU) -- URL:=http://linuxwireless.org/ -- MAINTAINER:=Felix Fietkau -- DEPENDS:=@(!(TARGET_avr32||TARGET_ps3||TARGET_pxcab)||BROKEN) --endef -- --define KernelPackage/cfg80211 -- $(call KernelPackage/mac80211/Default) -- TITLE:=cfg80211 - wireless configuration API -- DEPENDS+= +iw -- FILES:= \ -- $(PKG_BUILD_DIR)/compat/compat.ko \ -- $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko -- AUTOLOAD:=$(call AutoLoad,20,compat cfg80211) --endef -- --define KernelPackage/cfg80211/description --cfg80211 is the Linux wireless LAN (802.11) configuration API. --endef -- --define KernelPackage/mac80211 -- $(call KernelPackage/mac80211/Default) -- TITLE:=Linux 802.11 Wireless Networking Stack -- DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 -- KCONFIG:=\ -- CONFIG_AVERAGE=y -- FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko -- AUTOLOAD:=$(call AutoLoad,21,mac80211) -- MENU:=1 --endef -- --define KernelPackage/mac80211/config -- if PACKAGE_kmod-mac80211 -- -- config PACKAGE_MAC80211_DEBUGFS -- bool "Export mac80211 internals in DebugFS" -- select KERNEL_DEBUG_FS -- select KERNEL_RELAY if PACKAGE_kmod-ath9k-common -- default y -- help -- Select this to see extensive information about -- the internal state of mac80211 in debugfs. -- -- config PACKAGE_MAC80211_MESH -- bool "Enable 802.11s mesh support" -- default y -- -- endif --endef -- --define KernelPackage/mac80211/description --Generic IEEE 802.11 Networking Stack (mac80211) --endef -- --PKG_LINUX_FIRMWARE_NAME:=linux-firmware --PKG_LINUX_FIRMWARE_VERSION:=7d0c7a8cfd78388d90cc784a185b19dcbdbce824 --PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 --PKG_LINUX_FIRMWARE_PROTO:=git --PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git --PKG_LINUX_FIRMWARE_SUBDIR:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION) --PKG_LINUX_FIRMWARE_MIRROR_MD5SUM:=837a1a9456c1ec8b428cc0b2b08a331b -- --define Download/linux-firmware -- FILE:=$(PKG_LINUX_FIRMWARE_SOURCE) -- URL:=$(PKG_LINUX_FIRMWARE_SOURCE_URL) -- MD5SUM:=$(PKG_LINUX_FIRMWARE_MD5SUM) -- PROTO:=$(PKG_LINUX_FIRMWARE_PROTO) -- VERSION:=$(PKG_LINUX_FIRMWARE_VERSION) -- SUBDIR:=$(PKG_LINUX_FIRMWARE_SUBDIR) -- MIRROR_MD5SUM:=$(PKG_LINUX_FIRMWARE_MIRROR_MD5SUM) --endef --$(eval $(call Download,linux-firmware)) -- --PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware --PKG_ATH10K_LINUX_FIRMWARE_VERSION:=d86e78e5c6be34329936c8bd73a212700437be2e --PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2 --PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git --PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git --PKG_ATH10K_LINUX_FIRMWARE_SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION) --#PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM:=? -- --define Download/ath10k-firmware -- FILE:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE) -- URL:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL) -- PROTO:=$(PKG_ATH10K_LINUX_FIRMWARE_PROTO) -- VERSION:=$(PKG_ATH10K_LINUX_FIRMWARE_VERSION) -- SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR) -- #MIRROR_MD5SUM:=$(PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM) --endef --$(eval $(call Download,ath10k-firmware)) -- --# Prism54 drivers --P54PCIFW:=2.13.12.0.arm --P54USBFW:=2.13.24.0.lm87.arm --P54SPIFW:=2.13.0.0.a.13.14.arm -- --define Download/p54usb -- FILE:=$(P54USBFW) -- URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb -- MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6 --endef --$(eval $(call Download,p54usb)) -- --define Download/p54pci -- FILE:=$(P54PCIFW) -- URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac -- MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4 --endef --$(eval $(call Download,p54pci)) -- --define Download/p54spi -- FILE:=$(P54SPIFW) -- URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560 -- MD5SUM:=42661f8ecbadd88012807493f596081d --endef --$(eval $(call Download,p54spi)) -- --define KernelPackage/p54/Default -- $(call KernelPackage/mac80211/Default) -- TITLE:=Prism54 Drivers --endef -- --define KernelPackage/p54/description -- Kernel module for Prism54 chipsets (mac80211) --endef -- --define KernelPackage/p54-common -- $(call KernelPackage/p54/Default) -- DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT||@TARGET_omap24xx +kmod-mac80211 +kmod-lib-crc-ccitt -- TITLE+= (COMMON) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.ko -- AUTOLOAD:=$(call AutoLoad,30,p54common) --endef -- --define KernelPackage/p54-pci -- $(call KernelPackage/p54/Default) -- TITLE+= (PCI) -- DEPENDS+= @PCI_SUPPORT +kmod-p54-common -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.ko -- AUTOLOAD:=$(call AutoLoad,31,p54pci) --endef -- --define KernelPackage/p54-usb -- $(call KernelPackage/p54/Default) -- TITLE+= (USB) -- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.ko -- AUTOLOAD:=$(call AutoLoad,31,p54usb) --endef -- --define KernelPackage/p54-spi -- $(call KernelPackage/p54/Default) -- TITLE+= (SPI) -- DEPENDS+= @TARGET_omap24xx +kmod-p54-common -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54spi.ko -- AUTOLOAD:=$(call AutoLoad,31,p54spi) --endef -- --define KernelPackage/rt2x00/Default -- $(call KernelPackage/mac80211/Default) -- TITLE:=Ralink Drivers for RT2x00 cards --endef -- --define KernelPackage/rt2x00-lib --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-mac80211 +kmod-lib-crc-itu-t -- TITLE+= (LIB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.ko -- AUTOLOAD:=$(call AutoLoad,24,rt2x00lib) -- MENU:=1 --endef -- --define KernelPackage/rt2x00-lib/config -- if PACKAGE_kmod-rt2x00-lib -- -- config PACKAGE_RT2X00_LIB_DEBUGFS -- bool "Enable rt2x00 debugfs support" -- depends on PACKAGE_MAC80211_DEBUGFS -- help -- Enable creation of debugfs files for the rt2x00 drivers. -- These debugfs files support both reading and writing of the -- most important register types of the rt2x00 hardware. -- -- config PACKAGE_RT2X00_DEBUG -- bool "Enable rt2x00 debug output" -- help -- Enable debugging output for all rt2x00 modules -- -- endif --endef -- --define KernelPackage/rt2x00-mmio --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6 -- HIDDEN:=1 -- TITLE+= (MMIO) -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00mmio.ko -- AUTOLOAD:=$(call AutoLoad,25,rt2x00mmio) --endef -- --define KernelPackage/rt2x00-pci --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-mmio +kmod-rt2x00-lib -- HIDDEN:=1 -- TITLE+= (PCI) -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.ko -- AUTOLOAD:=$(call AutoLoad,26,rt2x00pci) --endef -- --define KernelPackage/rt2x00-usb --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib +kmod-usb-core -- HIDDEN:=1 -- TITLE+= (USB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00usb.ko -- AUTOLOAD:=$(call AutoLoad,26,rt2x00usb) --endef -- --define KernelPackage/rt2800-lib --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-lib-crc-ccitt +@DRIVER_11N_SUPPORT -- HIDDEN:=1 -- TITLE+= (rt2800 LIB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.ko -- AUTOLOAD:=$(call AutoLoad,27,rt2800lib) --endef -- --define KernelPackage/rt2400-pci --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci -- TITLE+= (RT2400 PCI) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2400pci.ko -- AUTOLOAD:=$(call AutoLoad,27,rt2400pci) --endef -- --define KernelPackage/rt2500-pci --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci -- TITLE+= (RT2500 PCI) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500pci.ko -- AUTOLOAD:=$(call AutoLoad,27,rt2500pci) --endef -- --define KernelPackage/rt2500-usb --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb -- TITLE+= (RT2500 USB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2500usb.ko -- AUTOLOAD:=$(call AutoLoad,27,rt2500usb) --endef -- --define KernelPackage/rt61-pci --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci -- TITLE+= (RT2x61 PCI) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt61pci.ko -- AUTOLOAD:=$(call AutoLoad,27,rt61pci) --endef -- --define KernelPackage/rt73-usb -- $(call KernelPackage/rt2x00/Default) -- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb -- TITLE+= (RT73 USB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt73usb.ko -- AUTOLOAD:=$(call AutoLoad,27,rt73usb) --endef -- --define KernelPackage/rt2800-mmio --$(call KernelPackage/rt2x00/Default) -- TITLE += (RT28xx/RT3xxx MMIO) -- DEPENDS += +kmod-rt2800-lib +kmod-rt2x00-mmio -- HIDDEN:=1 -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800mmio.ko -- AUTOLOAD:=$(call AutoLoad,28,rt2800mmio) --endef -- --define KernelPackage/rt2800-soc --$(call KernelPackage/rt2x00/Default) -- DEPENDS += @TARGET_ramips_rt305x +kmod-rt2800-mmio +kmod-rt2800-lib -- TITLE += (RT28xx/RT3xxx SoC) -- FILES := \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800soc.ko -- AUTOLOAD:=$(call AutoLoad,29,rt2x00soc rt2800soc) --endef -- --define KernelPackage/rt2800-pci --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-rt2800-mmio -- TITLE+= (RT2860 PCI) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko -- AUTOLOAD:=$(call AutoLoad,29,rt2800pci) --endef -- --define KernelPackage/rt2800-usb --$(call KernelPackage/rt2x00/Default) -- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-lib-crc-ccitt -- TITLE+= (RT2870 USB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko -- AUTOLOAD:=$(call AutoLoad,28,rt2800usb) --endef -- --define KernelPackage/rtl818x/Default -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek Drivers for RTL818x devices -- URL:=http://wireless.kernel.org/en/users/Drivers/rtl8187 -- DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 --endef -- --define KernelPackage/rtl8180 -- $(call KernelPackage/rtl818x/Default) -- DEPENDS+= @PCI_SUPPORT -- TITLE+= (RTL8180 PCI) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko -- AUTOLOAD:=$(call AutoLoad,27,rtl8180) --endef -- --define KernelPackage/rtl8187 --$(call KernelPackage/rtl818x/Default) -- DEPENDS+= @USB_SUPPORT +kmod-usb-core -- TITLE+= (RTL8187 USB) -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko -- AUTOLOAD:=$(call AutoLoad,27,rtl8187) --endef -- --define KernelPackage/rtlwifi/config -- menu "Configuration" -- depends on PACKAGE_kmod-rtlwifi -- -- config PACKAGE_RTLWIFI_DEBUG -- bool "Realtek wireless debugging" -- help -- Say Y, if you want to debug realtek wireless drivers. -- -- endmenu --endef -- --define KernelPackage/rtlwifi -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek common driver part -- DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211 +@DRIVER_11N_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtlwifi.ko -- AUTOLOAD:=$(call AutoLoad,60,rtlwifi) -- MENU:=1 --endef -- --define KernelPackage/rtlwifi-pci -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek common driver part (PCI support) -- DEPENDS+= @PCI_SUPPORT +kmod-rtlwifi -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl_pci.ko -- AUTOLOAD:=$(call AutoLoad,61,rtl_pci) -- HIDDEN:=1 --endef -- --define KernelPackage/rtlwifi-usb -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek common driver part (USB support) -- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-rtlwifi -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl_usb.ko -- AUTOLOAD:=$(call AutoLoad,61,rtl_usb) -- HIDDEN:=1 --endef -- --define KernelPackage/rtl8192c-common -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek RTL8192CE/RTL8192CU common support module -- DEPENDS+= +kmod-rtlwifi -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko -- AUTOLOAD:=$(call AutoLoad,62,rtl8192c-common) -- HIDDEN:=1 --endef -- --define KernelPackage/rtl8192ce -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek RTL8192CE/RTL8188CE support -- DEPENDS+= +kmod-rtlwifi-pci +kmod-rtl8192c-common -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko -- AUTOLOAD:=$(call AutoLoad,63,rtl8192ce) --endef -- --define KernelPackage/rtl8192ce/install -- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rtlwifi/rtl8192cfw.bin $(1)/lib/firmware/rtlwifi --endef -- --define KernelPackage/rtl8192se -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek RTL8192SE/RTL8191SE support -- DEPENDS+= +kmod-rtlwifi-pci -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko -- AUTOLOAD:=$(call AutoLoad,63,rtl8192se) --endef -- --define KernelPackage/rtl8192se/install -- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi --endef -- --define KernelPackage/rtl8192de -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek RTL8192DE/RTL8188DE support -- DEPENDS+= +kmod-rtlwifi-pci -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko -- AUTOLOAD:=$(call AutoLoad,63,rtl8192de) --endef -- --define KernelPackage/rtl8192de/install -- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rtlwifi/rtl8192defw.bin $(1)/lib/firmware/rtlwifi --endef -- --define KernelPackage/rtl8192cu -- $(call KernelPackage/mac80211/Default) -- TITLE:=Realtek RTL8192CU/RTL8188CU support -- DEPENDS+= +kmod-rtlwifi-usb +kmod-rtl8192c-common -- FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko -- AUTOLOAD:=$(call AutoLoad,63,rtl8192cu) --endef -- --define KernelPackage/rtl8192cu/install -- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rtlwifi/rtl8192cufw.bin $(1)/lib/firmware/rtlwifi --endef -- --ZD1211FW_NAME:=zd1211-firmware --ZD1211FW_VERSION:=1.4 --define Download/zd1211rw -- FILE:=$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 -- URL:=@SF/zd1211/ -- MD5SUM:=19f28781d76569af8551c9d11294c870 --endef --$(eval $(call Download,zd1211rw)) -- --define KernelPackage/zd1211rw -- $(call KernelPackage/mac80211/Default) -- TITLE:=Zydas ZD1211 support -- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211 -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.ko -- AUTOLOAD:=$(call AutoLoad,60,zd1211rw) --endef -- --define KernelPackage/adm8211 -- $(call KernelPackage/mac80211/Default) -- TITLE:=ADMTek 8211 support -- DEPENDS+=@PCI_SUPPORT +kmod-mac80211 +kmod-eeprom-93cx6 -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/adm8211.ko -- AUTOLOAD:=$(call AutoLoad,60,adm8211) --endef -- --define KernelPackage/ath/config -- if PACKAGE_kmod-ath -- config ATH_USER_REGD -- bool "Force Atheros drivers to respect the user's regdomain settings" -- help -- Atheros' idea of regulatory handling is that the EEPROM of the card defines -- the regulatory limits and the user is only allowed to restrict the settings -- even further, even if the country allows frequencies or power levels that -- are forbidden by the EEPROM settings. -- -- Select this option if you want the driver to respect the user's decision about -- regulatory settings. -- -- config PACKAGE_ATH_DEBUG -- bool "Atheros wireless debugging" -- help -- Say Y, if you want to debug atheros wireless drivers. -- Right now only ath9k makes use of this. -- endif --endef -- --define KernelPackage/ath -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros common driver part -- DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_atheros +kmod-mac80211 -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko -- AUTOLOAD:=$(call AutoLoad,26,ath) -- MENU:=1 --endef -- --define KernelPackage/ath/description -- This module contains some common parts needed by Atheros Wireless drivers. --endef -- --define KernelPackage/ath5k -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros 5xxx wireless cards support -- URL:=http://linuxwireless.org/en/users/Drivers/ath5k -- DEPENDS+= @PCI_SUPPORT||@TARGET_atheros +kmod-ath -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko -- AUTOLOAD:=$(call AutoLoad,27,ath5k) --endef -- --define KernelPackage/ath5k/description -- This module adds support for wireless adapters based on -- Atheros 5xxx chipset. --endef -- --define KernelPackage/ath9k-common -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) -- URL:=http://linuxwireless.org/en/users/Drivers/ath9k -- DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko -- AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common) --endef -- --define KernelPackage/ath9k -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros 802.11n PCI wireless cards support -- URL:=http://linuxwireless.org/en/users/Drivers/ath9k -- DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath9k-common -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko -- AUTOLOAD:=$(call AutoLoad,28,ath9k) --endef -- --define KernelPackage/ath9k/description --This module adds support for wireless adapters based on --Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets. --endef -- --define KernelPackage/ath9k-htc -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros 802.11n USB device support -- URL:=http://linuxwireless.org/en/users/Drivers/ath9k -- DEPENDS+= @USB_SUPPORT +kmod-ath9k-common +kmod-usb-core -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_htc.ko -- AUTOLOAD:=$(call AutoLoad,55,ath9k_htc) --endef -- --define KernelPackage/ath9k-htc/description --This module adds support for wireless adapters based on --Atheros USB AR9271 and AR7010 family of chipsets. --endef -- --define KernelPackage/ath10k -- $(call KernelPackage/mac80211/Default) -- TITLE:=Atheros 802.11ac wireless cards support -- URL:=http://wireless.kernel.org/en/users/Drivers/ath10k -- DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko -- AUTOLOAD:=$(call AutoLoad,55,ath10k_core ath10k_pci) --endef -- --define KernelPackage/ath10k/description --This module adds support for wireless adapters based on --Atheros IEEE 802.11ac family of chipsets. For now only --PCI is supported. --endef -- --define KernelPackage/carl9170 -- $(call KernelPackage/mac80211/Default) -- TITLE:=Driver for Atheros AR9170 USB sticks -- DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +kmod-input-core +@DRIVER_11N_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko -- AUTOLOAD:=$(call AutoLoad,60,carl9170) --endef -- --define KernelPackage/lib80211 -- $(call KernelPackage/mac80211/Default) -- TITLE:=802.11 Networking stack -- DEPENDS:=+kmod-cfg80211 -- FILES:= \ -- $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \ -- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \ -- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_ccmp.ko \ -- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_tkip.ko -- AUTOLOAD:=$(call AutoLoad,21, \ -- lib80211 \ -- lib80211_crypt_wep \ -- lib80211_crypt_ccmp \ -- lib80211_crypt_tkip \ -- ) --endef -- --define KernelPackage/lib80211/description -- Kernel modules for 802.11 Networking stack -- Includes: -- - lib80211 -- - lib80211_crypt_wep -- - lib80211_crypt_tkip -- - lib80211_crytp_ccmp --endef -- --define KernelPackage/libertas-usb -- $(call KernelPackage/mac80211/Default) -- DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT -- TITLE:=Marvell 88W8015 Wireless Driver -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/usb8xxx.ko -- AUTOLOAD:=$(call AutoLoad,27,libertas usb8xxx) --endef -- --define KernelPackage/libertas-sd -- $(call KernelPackage/mac80211/Default) -- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc +@DRIVER_WEXT_SUPPORT -- TITLE:=Marvell 88W8686 Wireless Driver -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko -- AUTOLOAD:=$(call AutoLoad,91,libertas libertas_sdio) --endef -- --define KernelPackage/mac80211-hwsim -- $(call KernelPackage/mac80211/Default) -- TITLE:=mac80211 HW simulation device -- DEPENDS+= +kmod-mac80211 -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.ko -- AUTOLOAD:=$(call AutoLoad,60,mac80211_hwsim) --endef -- --define KernelPackage/net-libipw -- $(call KernelPackage/mac80211/Default) -- TITLE:=libipw for ipw2100 and ipw2200 -- DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko -- AUTOLOAD:=$(call AutoLoad,49,libipw) --endef -- --define KernelPackage/net-libipw/description -- Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200. --endef -- --IPW2100_NAME:=ipw2100-fw --IPW2100_VERSION:=1.3 -- --define Download/net-ipw2100 -- URL:=http://bughost.org/firmware/ -- FILE:=$(IPW2100_NAME)-$(IPW2100_VERSION).tgz -- MD5SUM=46aa75bcda1a00efa841f9707bbbd113 --endef --$(eval $(call Download,net-ipw2100)) -- --define KernelPackage/net-ipw2100 -- $(call KernelPackage/mac80211/Default) -- TITLE:=Intel IPW2100 driver -- DEPENDS:=@PCI_SUPPORT +kmod-net-libipw -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2100.ko -- AUTOLOAD:=$(call AutoLoad,50,ipw2100) --endef -- --define KernelPackage/net-ipw2100/description -- Kernel support for Intel IPW2100 -- Includes: -- - ipw2100 --endef -- --IPW2200_NAME:=ipw2200-fw --IPW2200_VERSION:=3.1 -- --define Download/net-ipw2200 -- URL:=http://bughost.org/firmware/ -- FILE:=$(IPW2200_NAME)-$(IPW2200_VERSION).tgz -- MD5SUM=eaba788643c7cc7483dd67ace70f6e99 --endef --$(eval $(call Download,net-ipw2200)) -- --define KernelPackage/net-ipw2200 -- $(call KernelPackage/mac80211/Default) -- TITLE:=Intel IPW2200 driver -- DEPENDS:=@PCI_SUPPORT +kmod-net-libipw -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/ipw2200.ko -- AUTOLOAD:=$(call AutoLoad,50,ipw2200) --endef -- --define KernelPackage/net-ipw2200/description -- Kernel support for Intel IPW2200 -- Includes: -- - ipw2200 --endef -- -- --define KernelPackage/net-hermes -- $(call KernelPackage/mac80211/Default) -- TITLE:=Hermes 802.11b chipset support -- DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko -- AUTOLOAD:=$(call AutoLoad,50,orinoco) --endef -- --define KernelPackage/net-hermes/description -- Kernel support for Hermes 802.11b chipsets --endef -- --define KernelPackage/net-hermes-pci -- $(call KernelPackage/mac80211/Default) -- TITLE:=Intersil Prism 2.5 PCI support -- DEPENDS:=@PCI_SUPPORT +kmod-net-hermes -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko -- AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) --endef -- --define KernelPackage/net-hermes-pci/description -- Kernel modules for Intersil Prism 2.5 PCI support --endef -- --define KernelPackage/net-hermes-plx -- $(call KernelPackage/mac80211/Default) -- TITLE:=PLX9052 based PCI adaptor -- DEPENDS:=@PCI_SUPPORT +kmod-net-hermes -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko -- AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) --endef -- --define KernelPackage/net-hermes-plx/description -- Kernel modules for Hermes in PLX9052 based PCI adaptors --endef -- --define KernelPackage/net-hermes-pcmcia -- $(call KernelPackage/mac80211/Default) -- TITLE:=Hermes based PCMCIA adaptors -- DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes @BROKEN -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko -- AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) --endef -- --define KernelPackage/net-hermes-pcmcia/description -- Kernel modules for Hermes based PCMCIA adaptors --endef -- --define KernelPackage/iwlagn -- $(call KernelPackage/mac80211/Default) -- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT -- TITLE:=Intel AGN Wireless support -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlwifi.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko -- AUTOLOAD:=$(call AutoLoad,60,iwlwifi iwldvm) -- MENU:=1 --endef -- --define KernelPackage/iwlagn/description -- iwlagn kernel module for Intel 5000/5150/1000/6000/6050/6005/6030/100 support --endef -- --define KernelPackage/iwlagn/config -- if PACKAGE_kmod-iwlagn -- -- config IWL5000_FW -- bool "Intel 5000 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN -- -- config IWL5150_FW -- bool "Intel 5150 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Wireless WiFi 5150AGN -- -- config IWL1000_FW -- bool "Intel 1000 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 1000 -- -- config IWL6000_FW -- bool "Intel 6000 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Ultimate-N 6300 and Advanced-N 6200 -- -- config IWL6050_FW -- bool "Intel 6050 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 -- -- config IWL6005_FW -- bool "Intel 6005 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Advanced-N 6205 -- -- config IWL6030_FW -- bool "Intel 6030 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 -- -- config IWL100_FW -- bool "Intel 100 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 100 -- -- config IWL2000_FW -- bool "Intel 2000 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 2200 -- -- config IWL2030_FW -- bool "Intel 2030 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 2230 -- -- config IWL105_FW -- bool "Intel 105 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 105 -- -- config IWL135_FW -- bool "Intel 135 Firmware" -- default y -- help -- Download and install firmware for: -- Intel Centrino Wireless-N 135 -- endif --endef -- --define KernelPackage/iwl-legacy -- $(call KernelPackage/mac80211/Default) -- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT -- TITLE:=Intel legacy Wireless support -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwlegacy.ko -- AUTOLOAD:=$(call AutoLoad,60,iwlegacy) --endef -- --define KernelPackage/iwl-legacy/description -- iwl-legacy kernel module for legacy Intel wireless support --endef -- --define KernelPackage/iwl3945 -- $(call KernelPackage/mac80211/Default) -- DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy -- TITLE:=Intel iwl3945 Wireless support -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.ko -- AUTOLOAD:=$(call AutoLoad,61,iwl3945) --endef -- --define KernelPackage/iwl3945/description -- iwl3945 kernel module for Intel 3945 support --endef -- --define KernelPackage/iwl4965 -- $(call KernelPackage/mac80211/Default) -- DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +@DRIVER_11N_SUPPORT -- TITLE:=Intel iwl4965 Wireless support -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.ko -- AUTOLOAD:=$(call AutoLoad,61,iwl4965) --endef -- --define KernelPackage/iwl4965/description -- iwl4965 kernel module for Intel 4965 support --endef -- -- --define KernelPackage/mwl8k -- $(call KernelPackage/mac80211/Default) -- TITLE:=Driver for Marvell TOPDOG 802.11 Wireless cards -- URL:=http://wireless.kernel.org/en/users/Drivers/mwl8k -- DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +@DRIVER_11N_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mwl8k.ko -- AUTOLOAD:=$(call AutoLoad,27,mwl8k) --endef -- --define KernelPackage/mwl8k/description -- Kernel modules for Marvell TOPDOG 802.11 Wireless cards --endef -- -- --define KernelPackage/wlcore -- $(call KernelPackage/mac80211/Default) -- TITLE:=TI common driver part -- DEPENDS+= @TARGET_omap +kmod-mac80211 +@DRIVER_11N_SUPPORT -- FILES:= \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ti/wlcore/wlcore.ko \ -- $(PKG_BUILD_DIR)/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko -- AUTOLOAD:=$(call AutoLoad,61,wlcore wlcore_sdio) --endef -- --define KernelPackage/wlcore/description -- This module contains some common parts needed by TI Wireless drivers. --endef -- --define KernelPackage/wl12xx -- $(call KernelPackage/mac80211/Default) -- TITLE:=Driver for TI WL12xx -- URL:=http://wireless.kernel.org/en/users/Drivers/wl12xx -- DEPENDS+= +kmod-wlcore -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wl12xx/wl12xx.ko -- AUTOLOAD:=$(call AutoLoad,62,wl12xx) --endef -- --define KernelPackage/wl12xx/description -- Kernel modules for TI WL12xx --endef -- --define KernelPackage/wl18xx -- $(call KernelPackage/mac80211/Default) -- TITLE:=Driver for TI WL18xx -- URL:=http://wireless.kernel.org/en/users/Drivers/wl18xx -- DEPENDS+= +kmod-wlcore -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko -- AUTOLOAD:=$(call AutoLoad,62,wl18xx) --endef -- --define KernelPackage/wl18xx/description -- Kernel modules for TI WL18xx --endef -- -- --#Broadcom firmware --ifneq ($(CONFIG_B43_FW_5_10),) -- PKG_B43_FWV4_NAME:=broadcom-wl -- PKG_B43_FWV4_VERSION:=5.10.56.27.3 -- PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/driver/wl_apsta/wl_prebuilt.o -- PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)_mipsel.tar.bz2 -- PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ -- PKG_B43_FWV4_MD5SUM:=3363e3a6b3d9d73c49dea870c7834eac --else --ifneq ($(CONFIG_B43_FW_4_178),) -- PKG_B43_FWV4_NAME:=broadcom-wl -- PKG_B43_FWV4_VERSION:=4.178.10.4 -- PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl_apsta.o -- PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2 -- PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ -- PKG_B43_FWV4_MD5SUM:=14477e8cbbb91b11896affac9b219fdb --else --ifneq ($(CONFIG_B43_FW_5_100_138),) -- PKG_B43_FWV4_NAME:=broadcom-wl -- PKG_B43_FWV4_VERSION:=5.100.138 -- PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/linux/wl_apsta.o -- PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2 -- PKG_B43_FWV4_SOURCE_URL:=http://www.lwfinger.com/b43-firmware/ -- PKG_B43_FWV4_MD5SUM:=f4e357b09eaf5d8b1f1920cf3493a555 --else -- PKG_B43_FWV4_NAME:=broadcom-wl -- PKG_B43_FWV4_VERSION:=4.150.10.5 -- PKG_B43_FWV4_OBJECT:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION)/driver/wl_apsta_mimo.o -- PKG_B43_FWV4_SOURCE:=$(PKG_B43_FWV4_NAME)-$(PKG_B43_FWV4_VERSION).tar.bz2 -- PKG_B43_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/ -- PKG_B43_FWV4_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60 --endif --endif --endif --ifneq ($(CONFIG_B43_OPENFIRMWARE),) -- PKG_B43_FWV4_NAME:=broadcom-wl -- PKG_B43_FWV4_VERSION:=5.2 -- PKG_B43_FWV4_OBJECT:=openfwwf-$(PKG_B43_FWV4_VERSION) -- PKG_B43_FWV4_SOURCE:=openfwwf-$(PKG_B43_FWV4_VERSION).tar.gz -- PKG_B43_FWV4_SOURCE_URL:=http://www.ing.unibs.it/openfwwf/firmware/ -- PKG_B43_FWV4_MD5SUM:=e045a135453274e439ae183f8498b0fa --endif -- -- --PKG_B43_FWV3_NAME:=wl_apsta --PKG_B43_FWV3_VERSION:=3.130.20.0 --PKG_B43_FWV3_SOURCE:=$(PKG_B43_FWV3_NAME)-$(PKG_B43_FWV3_VERSION).o --PKG_B43_FWV3_SOURCE_URL:=http://downloads.openwrt.org/sources/ --PKG_B43_FWV3_MD5SUM:=e08665c5c5b66beb9c3b2dd54aa80cb3 -- --define Download/b43 -- FILE:=$(PKG_B43_FWV4_SOURCE) -- URL:=$(PKG_B43_FWV4_SOURCE_URL) -- MD5SUM:=$(PKG_B43_FWV4_MD5SUM) --endef --$(eval $(call Download,b43)) -- --define Download/b43legacy -- FILE:=$(PKG_B43_FWV3_SOURCE) -- URL:=$(PKG_B43_FWV3_SOURCE_URL) -- MD5SUM:=$(PKG_B43_FWV3_MD5SUM) --endef --$(eval $(call Download,b43legacy)) -- -- --define KernelPackage/b43 -- $(call KernelPackage/mac80211/Default) -- TITLE:=Broadcom 43xx wireless support -- URL:=http://linuxwireless.org/en/users/Drivers/b43 -- KCONFIG:= \ -- CONFIG_HW_RANDOM=y -- DEPENDS+= +kmod-mac80211 +!TARGET_brcm47xx:kmod-bcma +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko -- AUTOLOAD:=$(call AutoLoad,30,b43) -- MENU:=1 --endef -- --define KernelPackage/b43/config -- if PACKAGE_kmod-b43 -- -- choice -- prompt "b43 firmware version" -- default B43_FW_5_100_138 -- help -- This option allows you to select the version of the b43 firmware. -- -- config B43_FW_4_150 -- bool "Firmware 410.2160 from driver 4.150.10.5 (old stable)" -- help -- Stable firmware for BCM43xx devices. -- -- If unsure, select this. -- -- config B43_FW_4_178 -- bool "Firmware 478.104 from driver 4.178.10.4" -- help -- Experimental firmware for BCM43xx devices. -- -- This firmware is not tested as much as the "stable" firmware. -- -- If unsure, select the "stable" firmware. -- -- config B43_FW_5_10 -- bool "Firmware 508.1084 from driver 5.10.56.27" -- help -- Newer experimental firmware for BCM43xx devices. -- -- This firmware is mostly untested. It is needed for some N-PHY devices. -- -- If unsure, select the "stable" firmware. -- -- config B43_FW_5_100_138 -- bool "Firmware 666.2 from driver 5.100.138 (stable)" -- help -- Newer experimental firmware for BCM43xx devices. -- -- This firmware is mostly untested. It is needed for some N-PHY devices. -- -- If unsure, select the "stable" firmware. -- -- config B43_OPENFIRMWARE -- bool "Open FirmWare for WiFi networks" -- help -- Opensource firmware for BCM43xx devices. -- -- Do _not_ select this, unless you know what you are doing. -- The Opensource firmware is not suitable for embedded devices, yet. -- It does not support QoS, which is bad for AccessPoints. -- It does not support hardware crypto acceleration, which is a showstopper -- for embedded devices with low CPU resources. -- -- If unsure, select the "stable" firmware. -- -- endchoice -- -- config B43_FW_SQUASH -- bool "Remove unnecessary firmware files" -- depends on !B43_OPENFIRMWARE -- default y -- help -- This options allows you to remove unnecessary b43 firmware files -- from the final rootfs image. This can reduce the rootfs size by -- up to 200k. -- -- If unsure, say Y. -- -- config B43_FW_SQUASH_COREREVS -- string "Core revisions to include" -- depends on B43_FW_SQUASH -- default "5,6,7,8,9,10,11,13,15,16,29" -- help -- This is a comma seperated list of core revision numbers. -- -- Example (keep files for rev5 only): -- 5 -- -- Example (keep files for rev5 and rev11): -- 5,11 -- -- config B43_FW_SQUASH_PHYTYPES -- string "PHY types to include" -- depends on B43_FW_SQUASH -- default "G,LP,N,HT" -- help -- This is a comma seperated list of PHY types: -- A => A-PHY -- AG => Dual A-PHY G-PHY -- G => G-PHY -- LP => LP-PHY -- N => N-PHY -- HT => HT-PHY -- LCN => LCN-PHY -- -- Example (keep files for G-PHY only): -- G -- -- Example (keep files for G-PHY and N-PHY): -- G,N -- -- config PACKAGE_B43_DEBUG -- bool "Enable debug output and debugfs for b43" -- default n -- help -- Enable additional debug output and runtime sanity checks for b43 -- and enables the debugfs interface. -- -- If unsure, say N. -- -- config PACKAGE_B43_PIO -- bool "Enable support for PIO transfer mode" -- default n -- help -- Enable support for using PIO instead of DMA. Unless you have DMA -- transfer problems you don't need this. -- -- If unsure, say N. -- -- config PACKAGE_B43_PHY_N -- bool "Enable support for N-PHYs" -- default y -- help -- Enable support for N-PHY. This includes support for the following devices: -- PCI: BCM4321, BCM4322, BCM43222, BCM43224, BCM43225 -- SoC: BCM4716, BCM4717, BCM4718 -- -- Currently only 11g speed is available. -- -- If unsure, say Y. -- -- config PACKAGE_B43_PHY_HT -- bool "Enable support for HT-PHYs" -- default y -- help -- Enable support for HT-PHY. This includes support for the following devices: -- PCI: BCM4331 -- -- Currently only 11g speed is available. -- -- If unsure, say Y. -- -- config PACKAGE_B43_PHY_LCN -- bool "Enable support for LCN-PHYs" -- depends on BROKEN -- default n -- help -- Currently broken. -- -- If unsure, say N. -- -- endif --endef -- --define KernelPackage/b43/description --Kernel module for Broadcom 43xx wireless support (mac80211 stack) new --endef -- --define KernelPackage/b43legacy -- $(call KernelPackage/mac80211/Default) -- TITLE:=Broadcom 43xx-legacy wireless support -- URL:=http://linuxwireless.org/en/users/Drivers/b43 -- KCONFIG:= \ -- CONFIG_HW_RANDOM=y -- DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.ko -- AUTOLOAD:=$(call AutoLoad,30,b43legacy) -- MENU:=1 --endef -- --define KernelPackage/b43legacy/config -- if PACKAGE_kmod-b43legacy -- -- config B43LEGACY_FW_SQUASH -- bool "Remove unnecessary firmware files" -- default y -- help -- This options allows you to remove unnecessary b43legacy firmware files -- from the final rootfs image. This can reduce the rootfs size by -- up to 50k. -- -- If unsure, say Y. -- -- config B43LEGACY_FW_SQUASH_COREREVS -- string "Core revisions to include" -- depends on B43LEGACY_FW_SQUASH -- default "1,2,3,4" -- help -- This is a comma seperated list of core revision numbers. -- -- Example (keep files for rev4 only): -- 4 -- -- Example (keep files for rev2 and rev4): -- 2,4 -- -- endif --endef -- --define KernelPackage/b43legacy/description --Kernel module for Broadcom 43xx-legacy wireless support (mac80211 stack) new --endef -- -- --define KernelPackage/brcmutil -- $(call KernelPackage/mac80211/Default) -- TITLE:=Broadcom IEEE802.11n common driver parts -- URL:=http://linuxwireless.org/en/users/Drivers/brcm80211 -- DEPENDS+=@PCI_SUPPORT||USB_SUPPORT -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko -- AUTOLOAD:=$(call AutoLoad,30,brcmutil) -- MENU:=1 --endef -- --define KernelPackage/brcmutil/description -- This module contains some common parts needed by Broadcom Wireless drivers brcmsmac and brcmfmac. --endef -- --define KernelPackage/brcmutil/config -- if PACKAGE_kmod-brcmutil -- -- config PACKAGE_BRCM80211_DEBUG -- bool "Broadcom wireless driver debugging" -- help -- Say Y, if you want to debug brcmsmac and brcmfmac wireless driver. -- -- endif --endef -- --PKG_BRCMSMAC_FW_NAME:=broadcom-wl --PKG_BRCMSMAC_FW_VERSION:=5.100.138 --PKG_BRCMSMAC_FW_OBJECT:=$(PKG_BRCMSMAC_FW_NAME)-$(PKG_BRCMSMAC_FW_VERSION)/linux/wl_apsta.o --PKG_BRCMSMAC_FW_SOURCE:=$(PKG_BRCMSMAC_FW_NAME)-$(PKG_BRCMSMAC_FW_VERSION).tar.bz2 --PKG_BRCMSMAC_FW_SOURCE_URL:=http://www.lwfinger.com/b43-firmware/ --PKG_BRCMSMAC_FW_MD5SUM:=f4e357b09eaf5d8b1f1920cf3493a555 -- --define Download/brcmsmac -- FILE:=$(PKG_BRCMSMAC_FW_SOURCE) -- URL:=$(PKG_BRCMSMAC_FW_SOURCE_URL) -- MD5SUM:=$(PKG_BRCMSMAC_FW_MD5SUM) --endef --$(eval $(call Download,brcmsmac)) -- --define KernelPackage/brcmsmac -- $(call KernelPackage/mac80211/Default) -- TITLE:=Broadcom IEEE802.11n PCIe SoftMAC WLAN driver -- URL:=http://linuxwireless.org/en/users/Drivers/brcm80211 -- DEPENDS+= +kmod-mac80211 +@DRIVER_11N_SUPPORT +!TARGET_brcm47xx:kmod-bcma +kmod-lib-cordic +kmod-lib-crc8 +kmod-brcmutil -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko -- AUTOLOAD:=$(call AutoLoad,31,brcmsmac) -- MENU:=1 --endef -- --define KernelPackage/brcmsmac/description -- Kernel module for Broadcom IEEE802.11n PCIe Wireless cards --endef -- --define KernelPackage/brcmsmac/config -- if PACKAGE_kmod-brcmsmac -- -- config BRCMSMAC_USE_FW_FROM_WL -- bool "Use firmware extracted from broadcom proprietary driver" -- default y -- help -- Instead of using the official brcmsmac firmware a firmware -- version 666.2 extracted from the proprietary Broadcom driver -- is used. This is needed to get core rev 17 used in bcm4716 -- to work. -- -- If unsure, say Y. -- -- endif --endef -- -- --define KernelPackage/brcmfmac -- $(call KernelPackage/mac80211/Default) -- TITLE:=Broadcom IEEE802.11n USB FullMAC WLAN driver -- URL:=http://linuxwireless.org/en/users/Drivers/brcm80211 -- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil -- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko -- AUTOLOAD:=$(call AutoLoad,60,brcmfmac) --endef -- --define KernelPackage/brcmfmac/description -- Kernel module for Broadcom IEEE802.11n USB Wireless cards --endef -- --config_package=$(if $(CONFIG_PACKAGE_kmod-$(1)),m) -- --config-y:= \ -- WLAN \ -- NL80211_TESTMODE \ -- CFG80211_WEXT \ -- CFG80211_INTERNAL_REGDB \ -- MAC80211_RC_MINSTREL \ -- MAC80211_RC_MINSTREL_HT \ -- MAC80211_RC_DEFAULT_MINSTREL \ -- --config-$(call config_package,cfg80211) += CFG80211 -- --config-$(call config_package,mac80211) += MAC80211 --config-$(CONFIG_PACKAGE_MAC80211_MESH) += MAC80211_MESH --ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS -- config-y += \ -- CFG80211_DEBUGFS \ -- MAC80211_DEBUGFS \ -- ATH9K_DEBUGFS \ -- ATH9K_HTC_DEBUGFS \ -- ATH10K_DEBUGFS \ -- CARL9170_DEBUGFS \ -- ATH5K_DEBUG --endif -- --config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP -- --config-$(call config_package,ath) += ATH_CARDS ATH_COMMON --config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG -- --config-$(call config_package,ath9k) += ATH9K --config-$(call config_package,ath9k-common) += ATH9K_COMMON --config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB --config-$(CONFIG_PCI) += ATH9K_PCI --config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD -- --config-$(call config_package,ath9k-htc) += ATH9K_HTC --config-$(call config_package,ath10k) += ATH10K ATH10K_PCI -- --config-$(call config_package,ath5k) += ATH5K --ifdef CONFIG_TARGET_atheros -- config-y += ATH5K_AHB --else -- config-y += ATH5K_PCI --endif -- --config-$(call config_package,carl9170) += CARL9170 -- --config-$(call config_package,b43) += B43 --config-y += B43_SSB B43_BCMA B43_PHY_LP --config-$(CONFIG_PACKAGE_B43_PHY_N) += B43_PHY_N --config-$(CONFIG_PACKAGE_B43_PHY_HT) += B43_PHY_HT --config-$(CONFIG_PACKAGE_B43_PIO) += B43_PIO --config-$(CONFIG_PACKAGE_B43_DEBUG) += B43_DEBUG -- --config-$(call config_package,b43legacy) += B43LEGACY --config-y += B43LEGACY_DMA_MODE -- --config-$(call config_package,brcmutil) += BRCMUTIL --config-$(call config_package,brcmsmac) += BRCMSMAC --config-$(call config_package,brcmfmac) += BRCMFMAC --config-y += BRCMFMAC_USB --config-$(CONFIG_PACKAGE_BRCM80211_DEBUG) += BRCMDBG -- --config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM -- --config-$(call config_package,rt2x00-lib) += RT2X00 RT2X00_LIB --config-$(call config_package,rt2x00-pci) += RT2X00_LIB_PCI --config-$(call config_package,rt2x00-mmio) += RT2X00_LIB_MMIO --config-$(call config_package,rt2x00-usb) += RT2X00_LIB_USB --config-$(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS) += RT2X00_LIB_DEBUGFS --config-$(CONFIG_PACKAGE_RT2X00_DEBUG) += RT2X00_DEBUG -- --config-$(call config_package,rt2400-pci) += RT2400PCI --config-$(call config_package,rt2500-pci) += RT2500PCI --config-$(call config_package,rt2500-usb) += RT2500USB --config-$(call config_package,rt61-pci) += RT61PCI --config-$(call config_package,rt73-usb) += RT73USB -- --config-$(call config_package,rt2800-lib) += RT2800_LIB -- --config-$(call config_package,rt2800-soc) += RT2800SOC --config-$(call config_package,rt2800-pci) += RT2800PCI --config-y += RT2800PCI_RT33XX RT2800PCI_RT35XX RT2800PCI_RT53XX RT2800PCI_RT3290 -- --config-$(call config_package,rt2800-usb) += RT2800USB --config-y += RT2800USB_RT33XX RT2800USB_RT35XX RT2800USB_RT3573 RT2800USB_RT53XX RT2800USB_RT55XX -- --config-$(call config_package,iwl-legacy) += IWLEGACY --config-$(call config_package,iwl3945) += IWL3945 --config-$(call config_package,iwl4965) += IWL4965 --config-$(call config_package,iwlagn) += IWLWIFI IWLDVM -- --config-$(call config_package,net-libipw) += LIBIPW --config-$(call config_package,net-ipw2100) += IPW2100 --config-$(call config_package,net-ipw2200) += IPW2200 -- --config-$(call config_package,p54-common) += P54_COMMON --config-$(call config_package,p54-pci) += P54_PCI --config-$(call config_package,p54-usb) += P54_USB --config-$(call config_package,p54-spi) += P54_SPI -- --config-$(call config_package,net-hermes) += HERMES --config-$(call config_package,net-hermes-pci) += PCI_HERMES --config-$(call config_package,net-hermes-plx) += PLX_HERMES --config-$(call config_package,net-hermes-pcmcia) += PCMCIA_HERMES --config-y += HERMES_PRISM -- --config-$(call config_package,adm8211) += ADM8211 --config-$(call config_package,libertas-sd) += LIBERTAS LIBERTAS_SDIO --config-$(call config_package,libertas-usb) += LIBERTAS LIBERTAS_USB --config-$(call config_package,mwl8k) += MWL8K --config-$(call config_package,rtl8180) += RTL8180 --config-$(call config_package,rtl8187) += RTL8187 --config-$(call config_package,wlcore) += WLCORE WLCORE_SDIO --config-$(call config_package,wl12xx) += WL12XX --config-$(call config_package,wl18xx) += WL18XX --config-y += WL_TI WILINK_PLATFORM_DATA --config-$(call config_package,zd1211rw) += ZD1211RW -- --config-$(call config_package,rtlwifi) += RTL_CARDS RTLWIFI --config-$(call config_package,rtlwifi-pci) += RTLWIFI_PCI --config-$(call config_package,rtlwifi-usb) += RTLWIFI_USB --config-$(call config_package,rtl8192c-common) += RTL8192C_COMMON --config-$(call config_package,rtl8192ce) += RTL8192CE --config-$(call config_package,rtl8192se) += RTL8192SE --config-$(call config_package,rtl8192de) += RTL8192DE --config-$(call config_package,rtl8192cu) += RTL8192CU --config-$(CONFIG_PACKAGE_RTLWIFI_DEBUG) += RTLWIFI_DEBUG -- --config-$(CONFIG_LEDS_TRIGGERS) += MAC80211_LEDS B43_LEDS B43LEGACY_LEDS -- --MAKE_OPTS:= -C "$(PKG_BUILD_DIR)" \ -- CROSS_COMPILE="$(KERNEL_CROSS)" \ -- ARCH="$(LINUX_KARCH)" \ -- EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include" \ -- KLIB_BUILD="$(LINUX_DIR)" \ -- MODPROBE=true \ -- KLIB=$(TARGET_MODULES_DIR) \ -- KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER))) \ -- KBUILD_LDFLAGS_MODULE_PREREQ= -- --ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) -- MAKE_OPTS += V=1 --endif -- --define ConfigVars --$(subst $(space),,$(foreach opt,$(config-$(1)),CPTCFG_$(opt)=$(1) --)) --endef -- --define mac80211_config --$(call ConfigVars,m)$(call ConfigVars,y) --endef --$(eval $(call shexport,mac80211_config)) -- --define Build/Prepare -- rm -rf $(PKG_BUILD_DIR) -- mkdir -p $(PKG_BUILD_DIR) -- $(PKG_UNPACK) -- $(Build/Patch) -- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz -- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz -- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 -- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE) -- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE) -- rm -rf \ -- $(PKG_BUILD_DIR)/include/linux/ssb \ -- $(PKG_BUILD_DIR)/include/linux/bcma \ -- $(PKG_BUILD_DIR)/include/net/bluetooth -- -- rm -f \ -- $(PKG_BUILD_DIR)/include/linux/cordic.h \ -- $(PKG_BUILD_DIR)/include/linux/crc8.h \ -- $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h \ -- $(PKG_BUILD_DIR)/include/linux/wl12xx.h \ -- $(PKG_BUILD_DIR)/include/linux/spi/libertas_spi.h \ -- $(PKG_BUILD_DIR)/include/net/ieee80211.h -- -- echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version -- $(CP) ./files/regdb.txt $(PKG_BUILD_DIR)/net/wireless/db.txt --endef -- --ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),) -- define Build/Compile/kmod -- rm -rf $(PKG_BUILD_DIR)/modules -- +$(MAKE) $(PKG_JOBS) $(MAKE_OPTS) modules -- endef --endif -- --define Build/Configure -- cmp $(PKG_BUILD_DIR)/include/linux/ath9k_platform.h $(LINUX_DIR)/include/linux/ath9k_platform.h -- cmp $(PKG_BUILD_DIR)/include/linux/ath5k_platform.h $(LINUX_DIR)/include/linux/ath5k_platform.h -- cmp $(PKG_BUILD_DIR)/include/linux/rt2x00_platform.h $(LINUX_DIR)/include/linux/rt2x00_platform.h --endef -- --define Build/Compile -- $(SH_FUNC) var2file "$(call shvar,mac80211_config)" $(PKG_BUILD_DIR)/.config -- $(MAKE) $(MAKE_OPTS) allnoconfig -- $(call Build/Compile/kmod) --endef -- --define Build/InstallDev -- mkdir -p \ -- $(1)/usr/include/mac80211 \ -- $(1)/usr/include/mac80211-backport \ -- $(1)/usr/include/mac80211/ath \ -- $(1)/usr/include/net/mac80211 -- $(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/ -- $(CP) $(PKG_BUILD_DIR)/backport-include/* $(1)/usr/include/mac80211-backport/ -- $(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/ -- $(CP) $(PKG_BUILD_DIR)/drivers/net/wireless/ath/*.h $(1)/usr/include/mac80211/ath/ --endef -- --define KernelPackage/libertas-usb/install -- $(INSTALL_DIR) $(1)/lib/firmware/libertas -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8388_v9.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/usb8682.bin \ -- $(1)/lib/firmware/libertas/ --endef -- --define KernelPackage/libertas-sd/install -- $(INSTALL_DIR) $(1)/lib/firmware/libertas -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385_helper.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8385.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9_helper.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8686_v9.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688_helper.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/libertas/sd8688.bin \ -- $(1)/lib/firmware/libertas --endef -- --define KernelPackage/cfg80211/install -- $(INSTALL_DIR) $(1)/lib/wifi -- $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi --endef -- --define KernelPackage/p54-pci/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci --endef -- --define KernelPackage/p54-usb/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb --endef -- --define KernelPackage/p54-spi/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm --endef -- --define KernelPackage/rt61-pci/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2561s.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2661.bin \ -- $(1)/lib/firmware/ --endef -- --define KernelPackage/rt73-usb/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt73.bin $(1)/lib/firmware/ --endef -- --define KernelPackage/rt2800-pci/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2860.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt3290.bin \ -- $(1)/lib/firmware --endef -- --define KernelPackage/rt2800-usb/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/rt2870.bin $(1)/lib/firmware/ --endef -- --define KernelPackage/wl12xx/install -- $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-mr.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-plt.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-sr.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl1271-nvs.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-mr.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-plt.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-sr.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-nvs.bin \ -- $(1)/lib/firmware/ti-connectivity --endef -- --define KernelPackage/wl18xx/install -- $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl18xx-conf.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl18xx-fw.bin \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl18xx-fw-2.bin \ -- $(1)/lib/firmware/ti-connectivity --endef -- --define KernelPackage/zd1211rw/install -- $(INSTALL_DIR) $(1)/lib/firmware/zd1211 -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 --endef -- --define KernelPackage/carl9170/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/carl9170-1.fw $(1)/lib/firmware --endef -- --define KernelPackage/ath9k-htc/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_9271.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_7010.fw \ -- $(1)/lib/firmware/ --endef -- --define KernelPackage/ath10k/install -- $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0 -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \ -- $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/firmware-2.bin \ -- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/ --endef -- --define KernelPackage/mwl8k/install -- $(INSTALL_DIR) $(1)/lib/firmware/mwl8k -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366_ap-3.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8366.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8366.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/fmimage_8687.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/mwl8k/helper_8687.fw \ -- $(1)/lib/firmware/mwl8k/ --endef -- --define KernelPackage/net-ipw2100/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/ipw2100-$(IPW2100_VERSION)*.fw $(1)/lib/firmware --endef -- --define KernelPackage/net-ipw2200/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware --endef -- --define KernelPackage/iwlagn/install -- $(INSTALL_DIR) $(1)/lib/firmware --ifneq ($(CONFIG_IWL5000_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL5150_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL1000_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL6000_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL6050_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL6005_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL6030_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL100_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL2000_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL2030_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL105_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-105-6.ucode $(1)/lib/firmware --endif --ifneq ($(CONFIG_IWL135_FW),) -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-135-6.ucode $(1)/lib/firmware --endif --endef -- --define KernelPackage/iwl3945/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware --endef -- --define KernelPackage/iwl4965/install -- $(INSTALL_DIR) $(1)/lib/firmware -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware --endef -- --define KernelPackage/b43/install -- rm -rf $(1)/lib/firmware/ --ifeq ($(CONFIG_B43_OPENFIRMWARE),y) -- tar xzf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" --else -- tar xjf "$(DL_DIR)/$(PKG_B43_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)" --endif -- $(INSTALL_DIR) $(1)/lib/firmware/ --ifeq ($(CONFIG_B43_OPENFIRMWARE),y) -- $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/" -- $(INSTALL_DIR) $(1)/lib/firmware/b43-open/ -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/ucode5.fw $(1)/lib/firmware/b43-open/ucode5.fw -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0bsinitvals5.fw $(1)/lib/firmware/b43-open/b0g0bsinitvals5.fw -- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT)/b0g0initvals5.fw $(1)/lib/firmware/b43-open/b0g0initvals5.fw --else -- b43-fwcutter -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_B43_FWV4_OBJECT) --endif --ifneq ($(CONFIG_B43_FW_SQUASH),) -- b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43" --endif --endef -- --define KernelPackage/b43legacy/install -- $(INSTALL_DIR) $(1)/lib/firmware/ -- b43-fwcutter --unsupported -w $(1)/lib/firmware/ $(DL_DIR)/$(PKG_B43_FWV3_SOURCE) --ifneq ($(CONFIG_B43LEGACY_FW_SQUASH),) -- b43-fwsquash.py "G" "$(CONFIG_B43LEGACY_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43legacy" --endif --endef -- --define KernelPackage/brcmsmac/install -- $(INSTALL_DIR) $(1)/lib/firmware/brcm --ifeq ($(CONFIG_BRCMSMAC_USE_FW_FROM_WL),y) -- tar xjf "$(DL_DIR)/$(PKG_BRCMSMAC_FW_SOURCE)" -C "$(PKG_BUILD_DIR)" -- b43-fwcutter --brcmsmac -w $(1)/lib/firmware/ $(PKG_BUILD_DIR)/$(PKG_BRCMSMAC_FW_OBJECT) --else -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx-0.fw \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx_hdr-0.fw \ -- $(1)/lib/firmware/brcm/ --endif --endef -- --define KernelPackage/brcmfmac/install -- $(INSTALL_DIR) $(1)/lib/firmware/brcm -- $(INSTALL_DATA) \ -- $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43236b.bin \ -- $(1)/lib/firmware/brcm/ --endef -- --$(eval $(call KernelPackage,adm8211)) --$(eval $(call KernelPackage,ath5k)) --$(eval $(call KernelPackage,lib80211)) --$(eval $(call KernelPackage,libertas-usb)) --$(eval $(call KernelPackage,libertas-sd)) --$(eval $(call KernelPackage,cfg80211)) --$(eval $(call KernelPackage,mac80211)) --$(eval $(call KernelPackage,p54-common)) --$(eval $(call KernelPackage,p54-pci)) --$(eval $(call KernelPackage,p54-usb)) --$(eval $(call KernelPackage,p54-spi)) --$(eval $(call KernelPackage,rt2x00-lib)) --$(eval $(call KernelPackage,rt2x00-mmio)) --$(eval $(call KernelPackage,rt2x00-pci)) --$(eval $(call KernelPackage,rt2x00-usb)) --$(eval $(call KernelPackage,rt2800-lib)) --$(eval $(call KernelPackage,rt2400-pci)) --$(eval $(call KernelPackage,rt2500-pci)) --$(eval $(call KernelPackage,rt2500-usb)) --$(eval $(call KernelPackage,rt61-pci)) --$(eval $(call KernelPackage,rt73-usb)) --$(eval $(call KernelPackage,rt2800-mmio)) --$(eval $(call KernelPackage,rt2800-soc)) --$(eval $(call KernelPackage,rt2800-pci)) --$(eval $(call KernelPackage,rt2800-usb)) --$(eval $(call KernelPackage,rtl8180)) --$(eval $(call KernelPackage,rtl8187)) --$(eval $(call KernelPackage,rtlwifi)) --$(eval $(call KernelPackage,rtlwifi-pci)) --$(eval $(call KernelPackage,rtlwifi-usb)) --$(eval $(call KernelPackage,rtl8192c-common)) --$(eval $(call KernelPackage,rtl8192ce)) --$(eval $(call KernelPackage,rtl8192se)) --$(eval $(call KernelPackage,rtl8192de)) --$(eval $(call KernelPackage,rtl8192cu)) --$(eval $(call KernelPackage,zd1211rw)) --$(eval $(call KernelPackage,mac80211-hwsim)) --$(eval $(call KernelPackage,ath9k-common)) --$(eval $(call KernelPackage,ath9k)) --$(eval $(call KernelPackage,ath9k-htc)) --$(eval $(call KernelPackage,ath10k)) --$(eval $(call KernelPackage,ath)) --$(eval $(call KernelPackage,carl9170)) --$(eval $(call KernelPackage,b43)) --$(eval $(call KernelPackage,b43legacy)) --$(eval $(call KernelPackage,brcmutil)) --$(eval $(call KernelPackage,brcmsmac)) --$(eval $(call KernelPackage,brcmfmac)) --$(eval $(call KernelPackage,net-libipw)) --$(eval $(call KernelPackage,net-ipw2100)) --$(eval $(call KernelPackage,net-ipw2200)) --$(eval $(call KernelPackage,iwlagn)) --$(eval $(call KernelPackage,iwl-legacy)) --$(eval $(call KernelPackage,iwl4965)) --$(eval $(call KernelPackage,iwl3945)) --$(eval $(call KernelPackage,mwl8k)) --$(eval $(call KernelPackage,net-hermes)) --$(eval $(call KernelPackage,net-hermes-pci)) --$(eval $(call KernelPackage,net-hermes-plx)) --$(eval $(call KernelPackage,net-hermes-pcmcia)) --$(eval $(call KernelPackage,wlcore)) --$(eval $(call KernelPackage,wl12xx)) --$(eval $(call KernelPackage,wl18xx)) -diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh -deleted file mode 100644 -index 1994ca3..0000000 ---- a/package/mac80211/files/lib/wifi/mac80211.sh -+++ /dev/null -@@ -1,655 +0,0 @@ --#!/bin/sh --append DRIVERS "mac80211" -- --mac80211_hostapd_setup_base() { -- local phy="$1" -- local ifname="$2" -- -- cfgfile="/var/run/hostapd-$phy.conf" -- -- config_get device "$vif" device -- config_get country "$device" country -- config_get hwmode "$device" hwmode -- config_get channel "$device" channel -- config_get beacon_int "$device" beacon_int -- config_get basic_rate_list "$device" basic_rate -- config_get_bool noscan "$device" noscan -- -- hostapd_set_log_options base_cfg "$device" -- -- [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" -- -- hostapd_channel=$channel -- [ "$channel" = auto -o "$channel" = 0 ] && hostapd_channel=acs_survey -- -- [ -n "$hwmode" ] && { -- config_get hwmode_11n "$device" hwmode_11n -- [ -n "$hwmode_11n" ] && { -- hwmode="$hwmode_11n" -- append base_cfg "ieee80211n=1" "$N" -- config_get htmode "$device" htmode -- config_get ht_capab_list "$device" ht_capab -- case "$htmode" in -- HT20|HT40+|HT40-) ht_capab="[$htmode]";; -- *)ht_capab=;; -- esac -- for cap in $ht_capab_list; do -- ht_capab="$ht_capab[$cap]" -- done -- [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N" -- } -- } -- -- local country_ie=0 -- [ -n "$country" ] && country_ie=1 -- config_get_bool country_ie "$device" country_ie "$country_ie" -- [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N" -- -- local br brval brstr -- [ -n "$basic_rate_list" ] && { -- for br in $basic_rate_list; do -- brval="$(($br / 100))" -- [ -n "$brstr" ] && brstr="$brstr " -- brstr="$brstr$brval" -- done -- } -- -- cat >> "$cfgfile" <