mac80211: update to wireless-testing 2017-11-01

The wireless regdb is now loaded via firmware loading, CRDA support and
built-in regdb support have been removed.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index fa90b3616b5864e279133cf6c3989c61c697cabd..6ce9930ad2fee0b45dae47d69e21e6d2b20686a9 100644 (file)
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
 
 PKG_NAME:=mac80211
 

-PKG_VERSION:=2017-10-06
+PKG_VERSION:=2017-11-01

 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources

-PKG_HASH:=194786b7635f36b9ce280fd2319f6a4feeff209175e330ddbcbe789a3b4540a5
+PKG_HASH:=8437ab7886b988c8152e7a4db30b7f41009e49a3b2cb863edd05da1ecd7eb05a

 
 PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
 
 PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)


@@ -87,7 +87,7 @@ endef
 define KernelPackage/cfg80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=cfg80211 - wireless configuration API
 define KernelPackage/cfg80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=cfg80211 - wireless configuration API

-  DEPENDS+= +iw
+  DEPENDS+= +iw +wireless-regdb

   FILES:= \
        $(PKG_BUILD_DIR)/compat/compat.ko \
        $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
   FILES:= \
        $(PKG_BUILD_DIR)/compat/compat.ko \
        $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko


@@ -1516,7 +1516,6 @@ config-y:= \
        WLAN \
        NL80211_TESTMODE \
        CFG80211_WEXT \
        WLAN \
        NL80211_TESTMODE \
        CFG80211_WEXT \

-       CFG80211_INTERNAL_REGDB \

        CFG80211_CERTIFICATION_ONUS \
        MAC80211_RC_MINSTREL \
        MAC80211_RC_MINSTREL_HT \
        CFG80211_CERTIFICATION_ONUS \
        MAC80211_RC_MINSTREL \
        MAC80211_RC_MINSTREL_HT \


@@ -1568,7 +1567,7 @@ config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_C
 
 config-$(call config_package,airo) += AIRO
 
 
 config-$(call config_package,airo) += AIRO
 

-config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
+config-$(call config_package,ath) += ATH_CARDS ATH_COMMON ATH_REG_DYNAMIC_USER_REG_HINTS

 config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
 config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
 
 config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG ATH9K_STATION_STATISTICS
 config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
 


@@ -1742,7 +1741,6 @@ define Build/Prepare
                $(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.h
 
        echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version
                $(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.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),)
 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)

diff --git a/package/kernel/mac80211/files/regdb.txt b/package/kernel/mac80211/files/regdb.txt
deleted file mode 100644 (file)
index d583887..0000000
--- a/package/kernel/mac80211/files/regdb.txt
+++ /dev/null
@@ -1,1314 +0,0 @@
-# This is the world regulatory domain
-country 00:
-       (2402 - 2472 @ 40), (20)
-       # Channel 12 - 13.
-       (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW
-       # Channel 14. Only JP enables this and for 802.11b only
-       (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
-       # Channel 36 - 48
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       # Channel 52 - 64
-       (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
-       # Channel 100 - 144
-       (5490 - 5730 @ 160), (20), NO-IR, DFS
-       # Channel 149 - 165
-       (5735 - 5835 @ 80), (20), NO-IR
-       # IEEE 802.11ad (60GHz), channels 1..3
-       (57240 - 63720 @ 2160), (0)
-
-
-country AD:
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20)
-       (5250 - 5330 @ 80), (20), DFS
-       (5490 - 5710 @ 80), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country AE: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country AF: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://pucanguilla.org/Downloads/January2005-Anguilla%20Table%20of%20Allocations.pdf
-country AI: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country AL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20.00), AUTO-BW
-       (5250 - 5330 @ 80), (20.00), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27.00), DFS
-
-country AM: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (18)
-       (5250 - 5330 @ 20), (18), DFS
-
-country AN: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country AR: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country AS: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country AT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Source:
-# https://www.legislation.gov.au/Details/F2016C00432
-# Both DFS-ETSI and DFS-FCC are acceptable per AS/NZS 4268 Appendix B.
-# The EIRP for DFS bands can be increased by 3dB if TPC is implemented.
-# In order to allow 80MHz operation between 5650-5730MHz the upper boundary
-# of this more restrictive band has been shifted up by 5MHz from 5725MHz.
-country AU: DFS-ETSI
-       (2400 - 2483.5 @ 40), (36)
-       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (20), NO-OUTDOOR, AUTO-BW, DFS
-       (5470 - 5600 @ 80), (27), DFS
-       (5650 - 5730 @ 80), (27), DFS
-       (5730 - 5850 @ 80), (36)
-       (57000 - 66000 @ 2160), (43), NO-OUTDOOR
-
-country AW: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country AZ: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (18), AUTO-BW
-       (5250 - 5330 @ 80), (18), DFS, AUTO-BW
-
-country BA: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country BB: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country BD: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
-
-country BE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country BF: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Bulgarian rules as defined by the Communications Regulation Commission in the
-# following documents:
-#
-# Rules for carrying out electronic communications through radio equipment using
-# radio spectrum, which does not need to be individually assigned (the Rules):
-# http://www.crc.bg/files/_bg/Pravila_09_06_2015.pdf
-#
-# List of radio equipment that uses harmonized within the European Union bands
-# and electronic communications terminal equipment (the List):
-# http://www.crc.bg/files/_bg/Spisak_2015.pdf
-#
-# Note: The transmit power limits in the 5250-5350 MHz and 5470-5725 MHz bands
-# can be raised by 3 dBm if TPC is enabled. Refer to BDS EN 301 893 for details.
-country BG: DFS-ETSI
-       # Wideband data transmission systems (WDTS) in the 2.4GHz ISM band, ref:
-       # I.22 of the List, BDS EN 300 328
-       (2402 - 2482 @ 40), (20)
-       # 5 GHz Radio Local Area Networks (RLANs), ref:
-       # II.H01 of the List, BDS EN 301 893
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       # II.H01 of the List, I.54 from the List, BDS EN 301 893
-       (5490 - 5710 @ 160), (27), DFS
-       # Short range devices (SRDs) in the 5725-5875 MHz frequency range, ref:
-       # I.43 of the List, BDS EN 300 440-2, BDS EN 300 440-1
-       (5725 - 5875 @ 80), (14)
-       # 60 GHz Multiple-Gigabit RLAN Systems, ref:
-       # II.H03 of the List, BDS EN 302 567-2
-       (57000 - 66000 @ 2160), (40), NO-OUTDOOR
-
-country BH: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (20)
-       (5250 - 5330 @ 20), (20), DFS
-       (5735 - 5835 @ 20), (20)
-
-country BL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country BM: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country BN: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (20)
-
-country BO: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5250 - 5330 @ 80), (30), DFS
-       (5735 - 5835 @ 80), (30)
-
-country BR: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country BS: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.bicma.gov.bt/paper/publication/nrrpart4.pdf
-country BT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country BY: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country BZ: DFS-JP
-       (2402 - 2482 @ 40), (30)
-       (5735 - 5835 @ 80), (30)
-
-country CA: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5150 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5350 @ 80), (24), DFS, AUTO-BW
-       (5470 - 5600 @ 80), (24), DFS
-       (5650 - 5730 @ 80), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.art-rca.org
-country CF: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 40), (17)
-       (5250 - 5330 @ 40), (24), DFS
-       (5490 - 5730 @ 40), (24), DFS
-       (5735 - 5835 @ 40), (30)
-
-country CH: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country CI: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country CL: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (20)
-
-country CN: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-       # 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm
-       # ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
-       (57240 - 59400 @ 2160), (28)
-       (59400 - 63720 @ 2160), (44)
-       (63720 - 65880 @ 2160), (28)
-
-country CO: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country CR: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (24), DFS
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
-
-# http://www.mincom.gob.cu/?q=marcoregulatorio
-# - Redes Informáticas
-# Resolución 127, 2011 - Reglamento Banda 2,4 GHz.
-country CU: DFS-FCC
-       (2400 - 2483.5 @ 40), (200 mW)
-
-country CX: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country CY: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf
-# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf
-# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is
-# implemented.
-country CZ: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5725 @ 160), (500 mW), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Allocation for the 2.4 GHz band (Vfg 10 / 2013, Allgemeinzuteilung von
-# Frequenzen für die Nutzung in lokalen Netzwerken; Wireless Local Area
-# Networks (WLAN-Funkanwendungen).
-# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2013_10_WLAN_2,4GHz_pdf.pdf
-#
-# Allocation for the 5 GHz band (Vfg. 7 / 2010, Allgemeinzuteilung von
-# Frequenzen in den Bereichen 5150 MHz - 5350 MHz und 5470 MHz - 5725 MHz für
-# Funkanwendungen zur breitbandigen Datenübertragung, WAS/WLAN („Wireless
-# Access Systems including Wireless Local Area Networks“).
-# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2010_07_WLAN_5GHz_pdf.pdf
-# The values for the 5 GHz have been reduced by a factor of 2 (3db) for non TPC
-# devices (in other words: devices with TPC can use twice the tx power of this
-# table). Note that the docs do not require TPC for 5150--5250; the reduction
-# to 100mW thus is not strictly required -- however the conservative 100mW
-# limit is used here as the non-interference with radar and satellite
-# apps relies on the attenuation by the building walls only in the
-# absence of DFS; the neighbour countries have 100mW limit here as well.
-#
-# The ETSI EN 300 440-1 standard for short range devices in the 5 GHz band has
-# been implemented in Germany:
-# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2014_69_SRD_pdf.pdf
-#
-# Allocation for the 60 GHz band (Allgemeinzuteilung von Frequenzen im
-# Bereich 57 GHz - 66 GHz für Funkanwendungen für weitbandige
-# Datenübertragungssysteme; „Multiple Gigabit WAS/RLAN Systems (MGWS)“).
-# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2011_08_MGWS_pdf.pdf
-
-country DE: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5725 @ 160), (500 mW), DFS
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
-       # 60 GHz band channels 1-4 (ETSI EN 302 567)
-       (57000 - 66000 @ 2160), (40)
-
-country DK: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Source:
-# http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55
-country DM: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country DO: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country DZ: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170.000 - 5250.000 @ 80.000), (23.00), AUTO-BW
-       (5250.000 - 5330.000 @ 80.000), (23.00), DFS, AUTO-BW
-       (5490.000 - 5670.000 @ 160.000), (23.00), DFS
-
-country EC: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (24), DFS
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
-
-country EE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country EG: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 40), (20)
-       (5250 - 5330 @ 40), (20), DFS
-
-# Orden IET/787/2013, de 25 de abril, por la que se aprueba
-# el cuadro nacional de atribución de frecuencias.
-# http://www.boe.es/diario_boe/txt.php?id=BOE-A-2013-4845
-#
-# more info at "Cuadro nacional de atribución de frecuencias (CNAF)":
-# http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx
-
-country ES: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5725 @ 160), (500 mW), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country ET: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country FI: DFS-ETSI
-       (2400 - 2483.5 @ 40), (20)
-       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5725 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country FM: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country FR: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country GB: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country GD: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country GE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (18), AUTO-BW
-       (5250 - 5330 @ 80), (18), DFS, AUTO-BW
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country GF: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country GH: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country GL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country GP: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country GR: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country GT: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country GU: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (24), DFS
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
-
-country GY:
-       (2402 - 2482 @ 40), (30)
-       (5735 - 5835 @ 80), (30)
-
-country HK: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country HN: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country HR: DFS-ETSI
-       (2400 - 2483.5 @ 40), (20)
-       (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
-       (5470 - 5725 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country HT: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country HU: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country ID: DFS-JP
-       # ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
-       (2402 - 2482 @ 20), (20)
-       (5735 - 5815 @ 20), (23)
-
-country IE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country IL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
-
-country IN:
-       (2402 - 2482 @ 40), (20)
-       (5150 - 5350 @ 160), (23)
-       (5725 - 5875 @ 80), (23)
-
-country IR: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
-
-country IS: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country IT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country JM: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country JO: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23)
-       (5735 - 5835 @ 80), (23)
-
-country JP: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (2474 - 2494 @ 20), (20), NO-OFDM
-       (4910 - 4990 @ 40), (23)
-       (5030 - 5090 @ 40), (23)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (23), DFS
-       # 60 GHz band channels 2-4 at 10mW,
-       # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf
-       (59000 - 66000 @ 2160), (10 mW)
-
-country KE: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23)
-       (5490 - 5570 @ 80), (30), DFS
-       (5735 - 5775 @ 40), (23)
-
-country KH: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source
-# http://ntrc.kn/?page_id=7
-country KN: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (30), DFS
-       (5735 - 5815 @ 80), (30)
-
-country KP: DFS-JP
-       (2402 - 2482 @ 20), (20)
-       (5170 - 5250 @ 20), (20)
-       (5250 - 5330 @ 20), (20), DFS
-       (5490 - 5630 @ 20), (30), DFS
-       (5735 - 5815 @ 20), (30)
-
-country KR: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (30), DFS
-       (5735 - 5835 @ 80), (30)
-       # 60 GHz band channels 1-4,
-       # ref: http://www.law.go.kr/%ED%96%89%EC%A0%95%EA%B7%9C%EC%B9%99/%EB%AC%B4%EC%84%A0%EC%84%A4%EB%B9%84%EA%B7%9C%EC%B9%99
-       (57000 - 66000 @ 2160), (43)
-
-country KW: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country KY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country KZ:
-       (2402 - 2482 @ 40), (20)
-
-country LB: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.ntrc.org.lc/operational_structures.htm
-country LC: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (30), DFS
-       (5735 - 5815 @ 80), (30)
-
-country LI: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country LK: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (24), DFS
-       (5490 - 5730 @ 20), (24), DFS
-       (5735 - 5835 @ 20), (30)
-
-# Source:
-# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf
-country LS: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country LT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country LU: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country LV: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country MA: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country MC: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.cnfr.md/index.php?pag=sec&id=117&l=en
-country MD: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf
-country ME: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country MF: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country MH: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country MK: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country MN: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country MO: DFS-FCC
-       (2402 - 2482 @ 40), (23)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (30), DFS
-       (5735 - 5835 @ 80), (30)
-
-country MP: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country MQ: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.are.mr/pdfs/telec_freq_TNAbf_2010.pdf
-country MR: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country MT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country MU: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf
-country MV: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), AUTO-BW
-       (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
-       (5725 - 5850 @ 80), (100 mW)
-
-country MW: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country MX: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country MY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5650 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (24)
-
-country NG: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5250 - 5330 @ 80), (30), DFS
-       (5735 - 5835 @ 80), (30)
-
-country NI: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Regulation on the use of frequency space without a license and
-# without notification 2015
-#
-# http://wetten.overheid.nl/BWBR0036378/2015-03-05
-
-country NL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
-       (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # short range devices (ETSI EN 300 440-1)
-       (5725 - 5875 @ 80), (25 mW)
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
-# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can
-# be doubled if TPC is implemented.
-# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band
-# which has been merged with 5470 - 5725 MHz to allow wide channels
-country NO: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5250 @ 80), (200 mW), AUTO-BW
-       (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
-       (5470 - 5795 @ 160), (500 mW), DFS
-       (5815 - 5850 @ 35), (2000 mW), DFS
-       (17100 - 17300 @ 200), (100 mW)
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country NP: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (20)
-
-country NZ: DFS-ETSI
-       (2402 - 2482 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country OM: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country PA: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country PE: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country PF: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country PG: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country PH: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country PK: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
-
-country PL: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country PM: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country PR: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country PT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country PW: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country PY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country QA: DFS-JP
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
-
-country RE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country RO: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-
-# Source:
-# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
-country RS: DFS-ETSI
-       (2400 - 2483.5 @ 40), (100 mW)
-       (5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
-       (5470 - 5725 @ 20), (1000 mW), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country RU: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5650 - 5730 @ 80), (30), DFS
-       (5735 - 5835 @ 80), (30)
-       # 60 GHz band channels 1-4, ref: Changes to NLA 124_Order №129_22042015.pdf
-       (57000 - 66000 @ 2160), (40)
-
-country RW: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country SA: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country SE: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country SG: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country SI: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country SK: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-# Source:
-# Regulation N° 2004-005 ART/DG/DRC/D.Rég
-country SN: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country SR: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country SV: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 20), (17)
-       (5250 - 5330 @ 20), (23), DFS
-       (5735 - 5835 @ 20), (30)
-
-country SY:
-       (2402 - 2482 @ 40), (20)
-
-# Source:
-# http://www.telecommission.tc/Spectrum-plan20110324-101210.html
-country TC: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country TD: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country TG: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 40), (20)
-       (5250 - 5330 @ 40), (20), DFS
-       (5490 - 5710 @ 40), (27), DFS
-
-country TH: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country TN: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country TR: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country TT: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# Table of Frequency Allocations of Republic of China (Taiwan) / Nov 2014:
-#   http://www.motc.gov.tw/websitedowndoc?file=post/201411171137330.doc& \
-#      filedisplay=Table+of+radio+frequency+allocation.doc
-# LP0002 Low-power Radio-frequency Devices Technical Regulations / 28 Jun 2011:
-#   http://www.ncc.gov.tw/english/show_file.aspx?table_name=news&file_sn=681
-#   (section 3.10.1, 4.7)
-country TW: DFS-FCC
-       (2400 - 2483.5 @ 40), (30)
-       # Follow US 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
-       (5150 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5350 @ 80), (23), DFS, AUTO-BW
-       (5470 - 5725 @ 160), (23), DFS
-       (5725 - 5850 @ 80), (30)
- 
-country TZ:
-       (2402 - 2482 @ 40), (20)
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
-# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361
-# (appendix 8)
-# Listed 5GHz range is a lowest common denominator for all related
-# rules in the referenced laws. Such a range is used because of
-# disputable definitions there.
-country UA: DFS-ETSI
-       (2400 - 2483.5 @ 40), (20), NO-OUTDOOR
-       (5150 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
-       (5250 - 5350 @ 80), (20), DFS, NO-OUTDOOR, AUTO-BW
-       (5490 - 5670 @ 160), (20), DFS
-       (5735 - 5835 @ 80), (20)
-       # 60 GHz band channels 1-4, ref: Etsi En 302 567
-       (57000 - 66000 @ 2160), (40)
-
-country UG: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country US: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       # 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (23), DFS
-       (5735 - 5835 @ 80), (30)
-       # 60g band
-       # reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255
-       # channels 1,2,3, EIRP=40dBm(43dBm peak)
-       (57240 - 63720 @ 2160), (40)
-
-country UY: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://cemc.uz/article/1976/
-country UZ: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-# Source:
-# http://www.ntrc.vc/regulations/Jun_2006_Spectrum_Managment_Regulations.pdf
-country VC: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use
-# (10 June 2013)
-# http://www.conatel.gob.ve/
-country VE: DFS-FCC
-       (2402 - 2482 @ 40), (30)
-       (5170 - 5250 @ 80), (23), AUTO-BW
-       (5250 - 5330 @ 80), (23), DFS, AUTO-BW
-       (5735 - 5835 @ 80), (30)
-
-country VI: DFS-FCC
-       (2402 - 2472 @ 40), (30)
-       (5170 - 5250 @ 80), (24), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country VN: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17)
-       (5250 - 5330 @ 80), (24), DFS
-       (5490 - 5730 @ 80), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.trr.vu/attachments/category/130/GURL_for_Short-range_Radiocommunication_Devices2.pdf
-country VU: DFS-FCC
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (17), AUTO-BW
-       (5250 - 5330 @ 80), (24), DFS, AUTO-BW
-       (5490 - 5730 @ 160), (24), DFS
-       (5735 - 5835 @ 80), (30)
-
-country WF: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country WS: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 40), (20)
-       (5250 - 5330 @ 40), (20), DFS
-       (5490 - 5710 @ 40), (27), DFS
-
-country YE:
-       (2402 - 2482 @ 40), (20)
-
-country YT: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-
-country ZA: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (30)
-
-country ZW: DFS-ETSI
-       (2402 - 2482 @ 40), (20)
-       (5170 - 5250 @ 80), (20), AUTO-BW
-       (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-       (5490 - 5710 @ 160), (27), DFS
-

diff --git a/package/kernel/mac80211/patches/005-revert-devcoredump.patch b/package/kernel/mac80211/patches/005-revert-devcoredump.patch
index 1216b99574ca4ba9940f8b448bca09a4da04baff..d485d95586bd435e67c651f3f1d211405e4cb2a4 100644 (file)
--- a/package/kernel/mac80211/patches/005-revert-devcoredump.patch
+++ b/package/kernel/mac80211/patches/005-revert-devcoredump.patch
@@ -1,11 +1,11 @@
 --- a/compat/Makefile
 +++ b/compat/Makefile
 --- a/compat/Makefile
 +++ b/compat/Makefile

-@@ -39,8 +39,6 @@ compat-$(CPTCFG_KERNEL_4_10) += backport
- 
- compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
- compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
+@@ -70,8 +70,6 @@ quiet_cmd_build_OID_registry = GEN     $
+       cmd_build_OID_registry = perl $(src)/build_OID_registry $< $@
+ compat-$(CPTCFG_BPAUTO_ASN1_DECODER) += lib-asn1_decoder.o
+ compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += lib-oid_registry.o

 -skcipher-objs += crypto-skcipher.o
 -obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o
 -skcipher-objs += crypto-skcipher.o
 -obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o

- compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o

  compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
  cordic-objs += lib-cordic.o
  compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
  cordic-objs += lib-cordic.o

+ obj-$(CPTCFG_BPAUTO_BUILD_CORDIC) += cordic.o

diff --git a/package/kernel/mac80211/patches/006-fix-genl-multicast.patch b/package/kernel/mac80211/patches/006-fix-genl-multicast.patch
new file mode 100644 (file)
index 0000000..42fd3e8
--- /dev/null
+++ b/package/kernel/mac80211/patches/006-fix-genl-multicast.patch
@@ -0,0 +1,10 @@
+--- a/compat/backport-4.12.c
++++ b/compat/backport-4.12.c
+@@ -225,6 +225,7 @@ int bp_extack_genl_register_family(struc
+ 
+       /* copy this since the family might access it directly */
+       family->attrbuf = copy->family.attrbuf;
++      family->mcgrp_offset = copy->family.mcgrp_offset;
+ 
+       mutex_lock(&copies_mutex);
+       list_add_tail(&copy->list, &copies_list);

diff --git a/package/kernel/mac80211/patches/007-fix-linux-verification-h.patch b/package/kernel/mac80211/patches/007-fix-linux-verification-h.patch
new file mode 100644 (file)
index 0000000..4011f1d
--- /dev/null
+++ b/package/kernel/mac80211/patches/007-fix-linux-verification-h.patch
@@ -0,0 +1,11 @@
+--- a/backport-include/linux/verification.h
++++ b/backport-include/linux/verification.h
+@@ -1,7 +1,7 @@
+ #ifndef __BP_VERIFICATION_H
+ #define __BP_VERIFICATION_H
+ #include <linux/version.h>
+-#ifndef CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION
++#if LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION)
+ #include_next <linux/verification.h>
+ #else
+ #include <linux/key.h>

diff --git a/package/kernel/mac80211/patches/050-lib80211_option.patch b/package/kernel/mac80211/patches/050-lib80211_option.patch
index 3fc8c052071e9934ebc9ec39dce5a1d75a14a53a..28a0d905b718e194464b74c49dc8e38993b4af32 100644 (file)
--- a/package/kernel/mac80211/patches/050-lib80211_option.patch
+++ b/package/kernel/mac80211/patches/050-lib80211_option.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/Kconfig
 +++ b/net/wireless/Kconfig
 --- a/net/wireless/Kconfig
 +++ b/net/wireless/Kconfig

-@@ -171,7 +171,7 @@ config CFG80211_WEXT_EXPORT
+@@ -181,7 +181,7 @@ config CFG80211_WEXT_EXPORT

          wext compatibility symbols to be exported.
  
  config LIB80211
          wext compatibility symbols to be exported.
  
  config LIB80211


@@ -9,7 +9,7 @@
        depends on m
        default n
        help
        depends on m
        default n
        help

-@@ -181,15 +181,15 @@ config LIB80211
+@@ -191,15 +191,15 @@ config LIB80211

          Drivers should select this themselves if needed.
  
  config LIB80211_CRYPT_WEP
          Drivers should select this themselves if needed.
  
  config LIB80211_CRYPT_WEP

diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
index 1fc52f9ab0f67197c69b747dd400779499d7e0ee..d897b2b40eb8cd632bcfe8179134a232d6d94ddc 100644 (file)
--- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
+++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
@@ -1,6 +1,6 @@
 --- a/local-symbols
 +++ b/local-symbols
 --- a/local-symbols
 +++ b/local-symbols

-@@ -383,45 +383,6 @@ USB_IPHETH=
+@@ -388,45 +388,6 @@ USB_IPHETH=

  USB_SIERRA_NET=
  USB_VL600=
  USB_NET_CH9200=
  USB_SIERRA_NET=
  USB_VL600=
  USB_NET_CH9200=


@@ -121,7 +121,7 @@
  #source "$BACKPORT_DIR/drivers/media/Kconfig"
 --- a/Makefile.kernel
 +++ b/Makefile.kernel
  #source "$BACKPORT_DIR/drivers/media/Kconfig"
 --- a/Makefile.kernel
 +++ b/Makefile.kernel

-@@ -39,8 +39,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
+@@ -42,8 +42,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/

  obj-$(CPTCFG_WLAN) += drivers/net/wireless/
  #obj-$(CPTCFG_BT) += net/bluetooth/
  #obj-$(CPTCFG_BT) += drivers/bluetooth/
  obj-$(CPTCFG_WLAN) += drivers/net/wireless/
  #obj-$(CPTCFG_BT) += net/bluetooth/
  #obj-$(CPTCFG_BT) += drivers/bluetooth/

diff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
index 0febc57b3f3bea37a06e299d725523b3fd478856..aa44149aed05a9f69839386e07375671eb9dfefc 100644 (file)
--- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
+++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
@@ -1,270 +1,388 @@
---- a/net/mac80211/Kconfig
-+++ b/net/mac80211/Kconfig
-@@ -5,8 +5,6 @@ config MAC80211
-       depends on CRYPTO
-       depends on CRYPTO_ARC4
-       depends on CRYPTO_AES
--      select BPAUTO_CRYPTO_CCM
--      depends on CRYPTO_GCM
-       depends on CRYPTO_CMAC
-       depends on CRC32
-       ---help---

 --- a/net/mac80211/Makefile
 +++ b/net/mac80211/Makefile
 --- a/net/mac80211/Makefile
 +++ b/net/mac80211/Makefile

-@@ -16,9 +16,7 @@ mac80211-y := \
+@@ -6,7 +6,6 @@ mac80211-y := \
+       driver-ops.o \
+       sta_info.o \
+       wep.o \
+-      aead_api.o \
+       wpa.o \
+       scan.o offchannel.o \
+       ht.o agg-tx.o agg-rx.o \
+@@ -16,8 +15,8 @@ mac80211-y := \
+       rate.o \

        michael.o \
        tkip.o \
        michael.o \
        tkip.o \

-       aes_ccm.o \
--      aes_gcm.o \
++      aes_ccm.o \

        aes_cmac.o \
 -      aes_gmac.o \
        fils_aead.o \
        cfg.o \
        ethtool.o \
        aes_cmac.o \
 -      aes_gmac.o \
        fils_aead.o \
        cfg.o \
        ethtool.o \

---- a/net/mac80211/aes_ccm.c
-+++ b/net/mac80211/aes_ccm.c
-@@ -13,103 +13,132 @@
- #include <linux/types.h>
- #include <linux/err.h>
- #include <crypto/aead.h>
-+#include <crypto/aes.h>
- 
- #include <net/mac80211.h>
- #include "key.h"
- #include "aes_ccm.h"
- 
--int ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
--                            u8 *data, size_t data_len, u8 *mic,
--                            size_t mic_len)
-+static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, u8 *s_0,
-+                          u8 *a, u8 *b)
- {
+--- a/net/mac80211/aead_api.c
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/*
+- * Copyright 2003-2004, Instant802 Networks, Inc.
+- * Copyright 2005-2006, Devicescape Software, Inc.
+- * Copyright 2014-2015, Qualcomm Atheros, Inc.
+- *
+- * Rewrite: Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
+- */
+-
+-#include <linux/kernel.h>
+-#include <linux/types.h>
+-#include <linux/err.h>
+-#include <linux/scatterlist.h>
+-#include <crypto/aead.h>
+-
+-#include "aead_api.h"
+-
+-int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,
+-               u8 *data, size_t data_len, u8 *mic)
+-{
+-      size_t mic_len = crypto_aead_authsize(tfm);

 -      struct scatterlist sg[3];
 -      struct aead_request *aead_req;
 -      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
 -      u8 *__aad;
 -      struct scatterlist sg[3];
 -      struct aead_request *aead_req;
 -      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
 -      u8 *__aad;

-+      int i;
- 
--      aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);
+-
+-      aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);

 -      if (!aead_req)
 -              return -ENOMEM;
 -      if (!aead_req)
 -              return -ENOMEM;

-+      crypto_cipher_encrypt_one(tfm, b, b_0);
- 
+-

 -      __aad = (u8 *)aead_req + reqsize;
 -      __aad = (u8 *)aead_req + reqsize;

--      memcpy(__aad, aad, CCM_AAD_LEN);
-+      /* Extra Authenticate-only data (always two AES blocks) */
-+      for (i = 0; i < AES_BLOCK_SIZE; i++)
-+              aad[i] ^= b[i];
-+      crypto_cipher_encrypt_one(tfm, b, aad);
- 
+-      memcpy(__aad, aad, aad_len);
+-

 -      sg_init_table(sg, 3);
 -      sg_init_table(sg, 3);

--      sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
+-      sg_set_buf(&sg[0], __aad, aad_len);

 -      sg_set_buf(&sg[1], data, data_len);
 -      sg_set_buf(&sg[2], mic, mic_len);
 -      sg_set_buf(&sg[1], data, data_len);
 -      sg_set_buf(&sg[2], mic, mic_len);

-+      aad += AES_BLOCK_SIZE;
- 
+-

 -      aead_request_set_tfm(aead_req, tfm);
 -      aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
 -      aead_request_set_ad(aead_req, sg[0].length);
 -      aead_request_set_tfm(aead_req, tfm);
 -      aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
 -      aead_request_set_ad(aead_req, sg[0].length);

-+      for (i = 0; i < AES_BLOCK_SIZE; i++)
-+              aad[i] ^= b[i];
-+      crypto_cipher_encrypt_one(tfm, a, aad);
- 
+-

 -      crypto_aead_encrypt(aead_req);
 -      kzfree(aead_req);
 -      crypto_aead_encrypt(aead_req);
 -      kzfree(aead_req);

-+      /* Mask out bits from auth-only-b_0 */
-+      b_0[0] &= 0x07;
- 
+-

 -      return 0;
 -      return 0;

-+      /* S_0 is used to encrypt T (= MIC) */
-+      b_0[14] = 0;
-+      b_0[15] = 0;
-+      crypto_cipher_encrypt_one(tfm, s_0, b_0);
- }
- 
--int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
--                            u8 *data, size_t data_len, u8 *mic,
--                            size_t mic_len)
-+
-+void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
-+                             u8 *data, size_t data_len, u8 *mic,
-+                             size_t mic_len)
- {
+-}
+-
+-int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,
+-               u8 *data, size_t data_len, u8 *mic)
+-{
+-      size_t mic_len = crypto_aead_authsize(tfm);

 -      struct scatterlist sg[3];
 -      struct aead_request *aead_req;
 -      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
 -      u8 *__aad;
 -      int err;
 -      struct scatterlist sg[3];
 -      struct aead_request *aead_req;
 -      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
 -      u8 *__aad;
 -      int err;

-+      int i, j, last_len, num_blocks;
-+      u8 b[AES_BLOCK_SIZE];
-+      u8 s_0[AES_BLOCK_SIZE];
-+      u8 e[AES_BLOCK_SIZE];
-+      u8 *pos, *cpos;
- 
+-

 -      if (data_len == 0)
 -              return -EINVAL;
 -      if (data_len == 0)
 -              return -EINVAL;

-+      num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
-+      last_len = data_len % AES_BLOCK_SIZE;
-+      aes_ccm_prepare(tfm, b_0, aad, s_0, b, b);
- 
--      aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);
+-
+-      aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);

 -      if (!aead_req)
 -              return -ENOMEM;
 -      if (!aead_req)
 -              return -ENOMEM;

-+      /* Process payload blocks */
-+      pos = data;
-+      cpos = data;
-+      for (j = 1; j <= num_blocks; j++) {
-+              int blen = (j == num_blocks && last_len) ?
-+                      last_len : AES_BLOCK_SIZE;
- 
+-

 -      __aad = (u8 *)aead_req + reqsize;
 -      __aad = (u8 *)aead_req + reqsize;

--      memcpy(__aad, aad, CCM_AAD_LEN);
-+              /* Authentication followed by encryption */
-+              for (i = 0; i < blen; i++)
-+                      b[i] ^= pos[i];
-+              crypto_cipher_encrypt_one(tfm, b, b);
- 
+-      memcpy(__aad, aad, aad_len);
+-

 -      sg_init_table(sg, 3);
 -      sg_init_table(sg, 3);

--      sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
+-      sg_set_buf(&sg[0], __aad, aad_len);

 -      sg_set_buf(&sg[1], data, data_len);
 -      sg_set_buf(&sg[2], mic, mic_len);
 -      sg_set_buf(&sg[1], data, data_len);
 -      sg_set_buf(&sg[2], mic, mic_len);

-+              b_0[14] = (j >> 8) & 0xff;
-+              b_0[15] = j & 0xff;
-+              crypto_cipher_encrypt_one(tfm, e, b_0);
-+              for (i = 0; i < blen; i++)
-+                      *cpos++ = *pos++ ^ e[i];
-+      }
- 
+-

 -      aead_request_set_tfm(aead_req, tfm);
 -      aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
 -      aead_request_set_ad(aead_req, sg[0].length);
 -      aead_request_set_tfm(aead_req, tfm);
 -      aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
 -      aead_request_set_ad(aead_req, sg[0].length);

-+      for (i = 0; i < mic_len; i++)
-+              mic[i] = b[i] ^ s_0[i];
-+}
- 
+-

 -      err = crypto_aead_decrypt(aead_req);
 -      kzfree(aead_req);
 -      err = crypto_aead_decrypt(aead_req);
 -      kzfree(aead_req);

-+int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
-+                            u8 *data, size_t data_len, u8 *mic,
-+                            size_t mic_len)
-+{
-+      int i, j, last_len, num_blocks;
-+      u8 *pos, *cpos;
-+      u8 a[AES_BLOCK_SIZE];
-+      u8 b[AES_BLOCK_SIZE];
-+      u8 s_0[AES_BLOCK_SIZE];
- 
+-

 -      return err;
 -      return err;

-+      num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
-+      last_len = data_len % AES_BLOCK_SIZE;
-+      aes_ccm_prepare(tfm, b_0, aad, s_0, a, b);
-+
-+      /* Process payload blocks */
-+      cpos = data;
-+      pos = data;
-+      for (j = 1; j <= num_blocks; j++) {
-+              int blen = (j == num_blocks && last_len) ?
-+                      last_len : AES_BLOCK_SIZE;
-+
-+              /* Decryption followed by authentication */
-+              b_0[14] = (j >> 8) & 0xff;
-+              b_0[15] = j & 0xff;
-+              crypto_cipher_encrypt_one(tfm, b, b_0);
-+              for (i = 0; i < blen; i++) {
-+                      *pos = *cpos++ ^ b[i];
-+                      a[i] ^= *pos++;
-+              }
-+              crypto_cipher_encrypt_one(tfm, a, a);
-+      }
-+
-+      for (i = 0; i < mic_len; i++) {
-+              if ((mic[i] ^ s_0[i]) != a[i])
-+                      return -1;
-+      }
-+
-+      return 0;
- }
- 
--struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[],
--                                                  size_t key_len,
--                                                  size_t mic_len)
-+struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[],
-+                                                    size_t key_len,
-+                                                    size_t mic_len)
- {
+-}
+-
+-struct crypto_aead *
+-aead_key_setup_encrypt(const char *alg, const u8 key[],
+-                     size_t key_len, size_t mic_len)
+-{

 -      struct crypto_aead *tfm;
 -      int err;
 -
 -      struct crypto_aead *tfm;
 -      int err;
 -

--      tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
+-      tfm = crypto_alloc_aead(alg, 0, CRYPTO_ALG_ASYNC);

 -      if (IS_ERR(tfm))
 -              return tfm;
 -      if (IS_ERR(tfm))
 -              return tfm;

-+      struct crypto_cipher *tfm;
- 
+-

 -      err = crypto_aead_setkey(tfm, key, key_len);
 -      if (err)
 -              goto free_aead;
 -      err = crypto_aead_setauthsize(tfm, mic_len);
 -      if (err)
 -              goto free_aead;
 -      err = crypto_aead_setkey(tfm, key, key_len);
 -      if (err)
 -              goto free_aead;
 -      err = crypto_aead_setauthsize(tfm, mic_len);
 -      if (err)
 -              goto free_aead;

-+      tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
-+      if (!IS_ERR(tfm))
-+              crypto_cipher_setkey(tfm, key, key_len);
- 
-       return tfm;
+-
+-      return tfm;

 -
 -free_aead:
 -      crypto_free_aead(tfm);
 -      return ERR_PTR(err);
 -
 -free_aead:
 -      crypto_free_aead(tfm);
 -      return ERR_PTR(err);

- }
- 
--void ieee80211_aes_key_free(struct crypto_aead *tfm)
-+
-+void ieee80211_aes_key_free(struct crypto_cipher *tfm)
- {
+-}
+-
+-void aead_key_free(struct crypto_aead *tfm)
+-{

 -      crypto_free_aead(tfm);
 -      crypto_free_aead(tfm);

-+      crypto_free_cipher(tfm);
- }
---- a/net/mac80211/aes_gmac.h
-+++ b/net/mac80211/aes_gmac.h
-@@ -15,10 +15,22 @@
- #define GMAC_MIC_LEN  16
- #define GMAC_NONCE_LEN        12
+-}
+--- a/net/mac80211/aead_api.h
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/*
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
+- */
+-
+-#ifndef _AEAD_API_H
+-#define _AEAD_API_H
+-
+-#include <crypto/aead.h>
+-#include <linux/crypto.h>
+-
+-struct crypto_aead *
+-aead_key_setup_encrypt(const char *alg, const u8 key[],
+-                     size_t key_len, size_t mic_len);
+-
+-int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-               size_t aad_len, u8 *data,
+-               size_t data_len, u8 *mic);
+-
+-int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
+-               size_t aad_len, u8 *data,
+-               size_t data_len, u8 *mic);
+-
+-void aead_key_free(struct crypto_aead *tfm);
+-
+-#endif /* _AEAD_API_H */
+--- a/net/mac80211/aes_ccm.h
++++ b/net/mac80211/aes_ccm.h
+@@ -10,39 +10,17 @@
+ #ifndef AES_CCM_H
+ #define AES_CCM_H

  
  

--struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],
--                                               size_t key_len);
--int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
--                     const u8 *data, size_t data_len, u8 *mic);
--void ieee80211_aes_gmac_key_free(struct crypto_aead *tfm);
-+static inline struct crypto_aead *
-+ieee80211_aes_gmac_key_setup(const u8 key[], size_t key_len)
+-#include "aead_api.h"
+-
+-#define CCM_AAD_LEN   32
+-
+-static inline struct crypto_aead *
+-ieee80211_aes_key_setup_encrypt(const u8 key[], size_t key_len, size_t mic_len)
+-{
+-      return aead_key_setup_encrypt("ccm(aes)", key, key_len, mic_len);
+-}
+-
+-static inline int
+-ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm,
+-                        u8 *b_0, u8 *aad, u8 *data,
+-                        size_t data_len, u8 *mic)
+-{
+-      return aead_encrypt(tfm, b_0, aad + 2,
+-                          be16_to_cpup((__be16 *)aad),
+-                          data, data_len, mic);
+-}
+-
+-static inline int
+-ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm,
+-                        u8 *b_0, u8 *aad, u8 *data,
+-                        size_t data_len, u8 *mic)
+-{
+-      return aead_decrypt(tfm, b_0, aad + 2,
+-                          be16_to_cpup((__be16 *)aad),
+-                          data, data_len, mic);
+-}
++#include <linux/crypto.h>
+ 
+-static inline void ieee80211_aes_key_free(struct crypto_aead *tfm)
+-{
+-      return aead_key_free(tfm);
+-}
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[],
++                                                    size_t key_len,
++                                                    size_t mic_len);
++void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
++                             u8 *data, size_t data_len, u8 *mic,
++                             size_t mic_len);
++int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
++                            u8 *data, size_t data_len, u8 *mic,
++                            size_t mic_len);
++void ieee80211_aes_key_free(struct crypto_cipher *tfm);
+ 
+ #endif /* AES_CCM_H */
+--- /dev/null
++++ b/net/mac80211/aes_gcm.c
+@@ -0,0 +1,109 @@
++/*
++ * Copyright 2014-2015, Qualcomm Atheros, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/types.h>
++#include <linux/err.h>
++#include <crypto/aead.h>
++
++#include <net/mac80211.h>
++#include "key.h"
++#include "aes_gcm.h"
++
++int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
++                            u8 *data, size_t data_len, u8 *mic)

 +{
 +{

-+      return NULL;
++      struct scatterlist sg[3];
++      struct aead_request *aead_req;
++      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
++      u8 *__aad;
++
++      aead_req = kzalloc(reqsize + GCM_AAD_LEN, GFP_ATOMIC);
++      if (!aead_req)
++              return -ENOMEM;
++
++      __aad = (u8 *)aead_req + reqsize;
++      memcpy(__aad, aad, GCM_AAD_LEN);
++
++      sg_init_table(sg, 3);
++      sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
++      sg_set_buf(&sg[1], data, data_len);
++      sg_set_buf(&sg[2], mic, IEEE80211_GCMP_MIC_LEN);
++
++      aead_request_set_tfm(aead_req, tfm);
++      aead_request_set_crypt(aead_req, sg, sg, data_len, j_0);
++      aead_request_set_ad(aead_req, sg[0].length);
++
++      crypto_aead_encrypt(aead_req);
++      kzfree(aead_req);
++      return 0;

 +}
 +
 +}
 +

-+static inline int
-+ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
-+                 const u8 *data, size_t data_len, u8 *mic)
++int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
++                            u8 *data, size_t data_len, u8 *mic)

 +{
 +{

-+      return -EOPNOTSUPP;
++      struct scatterlist sg[3];
++      struct aead_request *aead_req;
++      int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
++      u8 *__aad;
++      int err;
++
++      if (data_len == 0)
++              return -EINVAL;
++
++      aead_req = kzalloc(reqsize + GCM_AAD_LEN, GFP_ATOMIC);
++      if (!aead_req)
++              return -ENOMEM;
++
++      __aad = (u8 *)aead_req + reqsize;
++      memcpy(__aad, aad, GCM_AAD_LEN);
++
++      sg_init_table(sg, 3);
++      sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));
++      sg_set_buf(&sg[1], data, data_len);
++      sg_set_buf(&sg[2], mic, IEEE80211_GCMP_MIC_LEN);
++
++      aead_request_set_tfm(aead_req, tfm);
++      aead_request_set_crypt(aead_req, sg, sg,
++                             data_len + IEEE80211_GCMP_MIC_LEN, j_0);
++      aead_request_set_ad(aead_req, sg[0].length);
++
++      err = crypto_aead_decrypt(aead_req);
++      kzfree(aead_req);
++
++      return err;

 +}
 +
 +}
 +

-+static inline void
-+ieee80211_aes_gmac_key_free(struct crypto_aead *tfm)
++struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],
++                                                      size_t key_len)
++{
++      struct crypto_aead *tfm;
++      int err;
++
++      tfm = crypto_alloc_aead("gcm(aes)", 0, CRYPTO_ALG_ASYNC);
++      if (IS_ERR(tfm))
++              return tfm;
++
++      err = crypto_aead_setkey(tfm, key, key_len);
++      if (err)
++              goto free_aead;
++      err = crypto_aead_setauthsize(tfm, IEEE80211_GCMP_MIC_LEN);
++      if (err)
++              goto free_aead;
++
++      return tfm;
++
++free_aead:
++      crypto_free_aead(tfm);
++      return ERR_PTR(err);
++}
++
++void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)

 +{
 +{

++      crypto_free_aead(tfm);

 +}
 +}

+--- a/net/mac80211/aes_gcm.h
++++ b/net/mac80211/aes_gcm.h
+@@ -9,38 +9,30 @@
+ #ifndef AES_GCM_H
+ #define AES_GCM_H

  
  

- #endif /* AES_GMAC_H */
---- a/net/mac80211/key.h
-+++ b/net/mac80211/key.h
-@@ -88,7 +88,7 @@ struct ieee80211_key {
-                        * Management frames.
-                        */
-                       u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
--                      struct crypto_aead *tfm;
-+                      struct crypto_cipher *tfm;
-                       u32 replays; /* dot11RSNAStatsCCMPReplays */
-               } ccmp;
-               struct {
+-#include "aead_api.h"
+-
+-#define GCM_AAD_LEN   32
++#include <linux/crypto.h>
+ 
+-static inline int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm,
+-                                          u8 *j_0, u8 *aad,  u8 *data,
+-                                          size_t data_len, u8 *mic)
++static inline void
++ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
++                        u8 *data, size_t data_len, u8 *mic)
+ {
+-      return aead_encrypt(tfm, j_0, aad + 2,
+-                          be16_to_cpup((__be16 *)aad),
+-                          data, data_len, mic);
+ }
+ 
+-static inline int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm,
+-                                          u8 *j_0, u8 *aad, u8 *data,
+-                                          size_t data_len, u8 *mic)
++static inline int
++ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
++                        u8 *data, size_t data_len, u8 *mic)
+ {
+-      return aead_decrypt(tfm, j_0, aad + 2,
+-                          be16_to_cpup((__be16 *)aad),
+-                          data, data_len, mic);
++    return -EOPNOTSUPP;
+ }
+ 
+ static inline struct crypto_aead *
+ ieee80211_aes_gcm_key_setup_encrypt(const u8 key[], size_t key_len)
+ {
+-      return aead_key_setup_encrypt("gcm(aes)", key,
+-                                    key_len, IEEE80211_GCMP_MIC_LEN);
++    return NULL;
+ }
+ 
+-static inline void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)
++static inline void
++ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)
+ {
+-      return aead_key_free(tfm);
+ }
+ 
+ #endif /* AES_GCM_H */

 --- a/net/mac80211/wpa.c
 +++ b/net/mac80211/wpa.c
 @@ -306,7 +306,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
 --- a/net/mac80211/wpa.c
 +++ b/net/mac80211/wpa.c
 @@ -306,7 +306,8 @@ ieee80211_crypto_tkip_decrypt(struct iee


@@ -318,7 +436,7 @@
        pos += IEEE80211_CCMP_HDR_LEN;
 -      ccmp_special_blocks(skb, pn, b_0, aad);
 -      return ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
        pos += IEEE80211_CCMP_HDR_LEN;
 -      ccmp_special_blocks(skb, pn, b_0, aad);
 -      return ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,

--                                       skb_put(skb, mic_len), mic_len);
+-                                       skb_put(skb, mic_len));

 +      ccmp_special_blocks(skb, pn, b_0, aad, len);
 +      ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
 +                                skb_put(skb, mic_len), mic_len);
 +      ccmp_special_blocks(skb, pn, b_0, aad, len);
 +      ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
 +                                skb_put(skb, mic_len), mic_len);


@@ -327,7 +445,7 @@
  }
  
  
  }
  
  

-@@ -537,7 +536,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -537,13 +536,13 @@ ieee80211_crypto_ccmp_decrypt(struct iee

                        u8 aad[2 * AES_BLOCK_SIZE];
                        u8 b_0[AES_BLOCK_SIZE];
                        /* hardware didn't decrypt/verify MIC */
                        u8 aad[2 * AES_BLOCK_SIZE];
                        u8 b_0[AES_BLOCK_SIZE];
                        /* hardware didn't decrypt/verify MIC */


@@ -336,6 +454,13 @@
  
                        if (ieee80211_aes_ccm_decrypt(
                                    key->u.ccmp.tfm, b_0, aad,
  
                        if (ieee80211_aes_ccm_decrypt(
                                    key->u.ccmp.tfm, b_0, aad,

+                                   skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN,
+                                   data_len,
+-                                  skb->data + skb->len - mic_len))
++                                  skb->data + skb->len - mic_len, mic_len))
+                               return RX_DROP_UNUSABLE;
+               }
+ 

 @@ -639,7 +638,7 @@ static int gcmp_encrypt_skb(struct ieee8
        u8 *pos;
        u8 pn[6];
 @@ -639,7 +638,7 @@ static int gcmp_encrypt_skb(struct ieee8
        u8 *pos;
        u8 pn[6];


@@ -379,70 +504,202 @@
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
  
        if (!ieee80211_is_mgmt(hdr->frame_control))
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
  
        if (!ieee80211_is_mgmt(hdr->frame_control))

---- a/net/mac80211/aes_ccm.h
-+++ b/net/mac80211/aes_ccm.h
-@@ -12,17 +12,15 @@
- 
- #include <linux/crypto.h>
- 
--#define CCM_AAD_LEN   32
--
--struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[],
--                                                  size_t key_len,
--                                                  size_t mic_len);
--int ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
--                            u8 *data, size_t data_len, u8 *mic,
--                            size_t mic_len);
--int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
-+struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[],
-+                                                    size_t key_len,
-+                                                    size_t mic_len);
+--- /dev/null
++++ b/net/mac80211/aes_ccm.c
+@@ -0,0 +1,144 @@
++/*
++ * Copyright 2003-2004, Instant802 Networks, Inc.
++ * Copyright 2005-2006, Devicescape Software, Inc.
++ *
++ * Rewrite: Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/types.h>
++#include <linux/err.h>
++#include <crypto/aead.h>
++#include <crypto/aes.h>
++
++#include <net/mac80211.h>
++#include "key.h"
++#include "aes_ccm.h"
++
++static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, u8 *s_0,
++                          u8 *a, u8 *b)
++{
++      int i;
++
++      crypto_cipher_encrypt_one(tfm, b, b_0);
++
++      /* Extra Authenticate-only data (always two AES blocks) */
++      for (i = 0; i < AES_BLOCK_SIZE; i++)
++              aad[i] ^= b[i];
++      crypto_cipher_encrypt_one(tfm, b, aad);
++
++      aad += AES_BLOCK_SIZE;
++
++      for (i = 0; i < AES_BLOCK_SIZE; i++)
++              aad[i] ^= b[i];
++      crypto_cipher_encrypt_one(tfm, a, aad);
++
++      /* Mask out bits from auth-only-b_0 */
++      b_0[0] &= 0x07;
++
++      /* S_0 is used to encrypt T (= MIC) */
++      b_0[14] = 0;
++      b_0[15] = 0;
++      crypto_cipher_encrypt_one(tfm, s_0, b_0);
++}
++
++

 +void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
 +                             u8 *data, size_t data_len, u8 *mic,
 +void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
 +                             u8 *data, size_t data_len, u8 *mic,

-+                             size_t mic_len);
++                             size_t mic_len)
++{
++      int i, j, last_len, num_blocks;
++      u8 b[AES_BLOCK_SIZE];
++      u8 s_0[AES_BLOCK_SIZE];
++      u8 e[AES_BLOCK_SIZE];
++      u8 *pos, *cpos;
++
++      num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++      last_len = data_len % AES_BLOCK_SIZE;
++      aes_ccm_prepare(tfm, b_0, aad, s_0, b, b);
++
++      /* Process payload blocks */
++      pos = data;
++      cpos = data;
++      for (j = 1; j <= num_blocks; j++) {
++              int blen = (j == num_blocks && last_len) ?
++                      last_len : AES_BLOCK_SIZE;
++
++              /* Authentication followed by encryption */
++              for (i = 0; i < blen; i++)
++                      b[i] ^= pos[i];
++              crypto_cipher_encrypt_one(tfm, b, b);
++
++              b_0[14] = (j >> 8) & 0xff;
++              b_0[15] = j & 0xff;
++              crypto_cipher_encrypt_one(tfm, e, b_0);
++              for (i = 0; i < blen; i++)
++                      *cpos++ = *pos++ ^ e[i];
++      }
++
++      for (i = 0; i < mic_len; i++)
++              mic[i] = b[i] ^ s_0[i];
++}
++

 +int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
 +int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,

-                             u8 *data, size_t data_len, u8 *mic,
-                             size_t mic_len);
--void ieee80211_aes_key_free(struct crypto_aead *tfm);
-+void ieee80211_aes_key_free(struct crypto_cipher *tfm);
- 
- #endif /* AES_CCM_H */
---- a/net/mac80211/aes_gcm.h
-+++ b/net/mac80211/aes_gcm.h
-@@ -11,14 +11,28 @@
- 
- #include <linux/crypto.h>
- 
--#define GCM_AAD_LEN   32
-+static inline void
-+ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
-+                        u8 *data, size_t data_len, u8 *mic)
++                            u8 *data, size_t data_len, u8 *mic,
++                            size_t mic_len)

 +{
 +{

++      int i, j, last_len, num_blocks;
++      u8 *pos, *cpos;
++      u8 a[AES_BLOCK_SIZE];
++      u8 b[AES_BLOCK_SIZE];
++      u8 s_0[AES_BLOCK_SIZE];
++
++      num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
++      last_len = data_len % AES_BLOCK_SIZE;
++      aes_ccm_prepare(tfm, b_0, aad, s_0, a, b);
++
++      /* Process payload blocks */
++      cpos = data;
++      pos = data;
++      for (j = 1; j <= num_blocks; j++) {
++              int blen = (j == num_blocks && last_len) ?
++                      last_len : AES_BLOCK_SIZE;
++
++              /* Decryption followed by authentication */
++              b_0[14] = (j >> 8) & 0xff;
++              b_0[15] = j & 0xff;
++              crypto_cipher_encrypt_one(tfm, b, b_0);
++              for (i = 0; i < blen; i++) {
++                      *pos = *cpos++ ^ b[i];
++                      a[i] ^= *pos++;
++              }
++              crypto_cipher_encrypt_one(tfm, a, a);
++      }
++
++      for (i = 0; i < mic_len; i++) {
++              if ((mic[i] ^ s_0[i]) != a[i])
++                      return -1;
++      }
++
++      return 0;

 +}
 +}

- 
--int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
--                            u8 *data, size_t data_len, u8 *mic);
--int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
--                            u8 *data, size_t data_len, u8 *mic);
--struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],
--                                                      size_t key_len);
--void ieee80211_aes_gcm_key_free(struct crypto_aead *tfm);
-+static inline int
-+ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,
-+                        u8 *data, size_t data_len, u8 *mic)
++
++struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[],
++                                                    size_t key_len,
++                                                    size_t mic_len)

 +{
 +{

-+    return -EOPNOTSUPP;
++      struct crypto_cipher *tfm;
++
++      tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
++      if (!IS_ERR(tfm))
++              crypto_cipher_setkey(tfm, key, key_len);
++
++      return tfm;

 +}
 +
 +}
 +

++
++void ieee80211_aes_key_free(struct crypto_cipher *tfm)
++{
++      crypto_free_cipher(tfm);
++}
+--- a/net/mac80211/Kconfig
++++ b/net/mac80211/Kconfig
+@@ -5,8 +5,6 @@ config MAC80211
+       depends on CRYPTO
+       depends on CRYPTO_ARC4
+       depends on CRYPTO_AES
+-      depends on CRYPTO_CCM
+-      depends on CRYPTO_GCM
+       depends on CRYPTO_CMAC
+       depends on CRC32
+       ---help---
+--- a/net/mac80211/aes_gmac.h
++++ b/net/mac80211/aes_gmac.h
+@@ -15,10 +15,22 @@
+ #define GMAC_MIC_LEN  16
+ #define GMAC_NONCE_LEN        12
+ 
+-struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],
+-                                               size_t key_len);
+-int ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
+-                     const u8 *data, size_t data_len, u8 *mic);
+-void ieee80211_aes_gmac_key_free(struct crypto_aead *tfm);

 +static inline struct crypto_aead *
 +static inline struct crypto_aead *

-+ieee80211_aes_gcm_key_setup_encrypt(const u8 key[], size_t key_len)
++ieee80211_aes_gmac_key_setup(const u8 key[], size_t key_len)

 +{
 +{

-+    return NULL;
++      return NULL;
++}
++
++static inline int
++ieee80211_aes_gmac(struct crypto_aead *tfm, const u8 *aad, u8 *nonce,
++                 const u8 *data, size_t data_len, u8 *mic)
++{
++      return -EOPNOTSUPP;

 +}
 +
 +static inline void
 +}
 +
 +static inline void

-+ieee80211_aes_gcm_key_free(struct crypto_aead *tfm)
++ieee80211_aes_gmac_key_free(struct crypto_aead *tfm)

 +{
 +}
  
 +{
 +}
  

- #endif /* AES_GCM_H */
+ #endif /* AES_GMAC_H */
+--- a/net/mac80211/key.h
++++ b/net/mac80211/key.h
+@@ -88,7 +88,7 @@ struct ieee80211_key {
+                        * Management frames.
+                        */
+                       u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
+-                      struct crypto_aead *tfm;
++                      struct crypto_cipher *tfm;
+                       u32 replays; /* dot11RSNAStatsCCMPReplays */
+               } ccmp;
+               struct {

diff --git a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
index 005e3e5d5d44804c3a0f16552bd203724aa938ef..3b1fcdf9c820771cf4e9328a50505d2ea33b5f4a 100644 (file)
--- a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
+++ b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
@@ -2,7 +2,7 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnects
 
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
 
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c

-@@ -1056,7 +1056,6 @@ static int ieee80211_stop_ap(struct wiph
+@@ -1058,7 +1058,6 @@ static int ieee80211_stop_ap(struct wiph

        sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
  
        __sta_info_flush(sdata, true);
        sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
  
        __sta_info_flush(sdata, true);

diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
index 42a692a1fcd85f0620eda76719bc8b5a09179365..781dd3c1bc15bf7def6a9459f116fe492acc77db 100644 (file)
--- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
@@ -18,7 +18,7 @@
  static int ieee80211_ifa6_changed(struct notifier_block *nb,
                                  unsigned long data, void *arg)
  {
  static int ieee80211_ifa6_changed(struct notifier_block *nb,
                                  unsigned long data, void *arg)
  {

-@@ -1115,14 +1115,14 @@ int ieee80211_register_hw(struct ieee802
+@@ -1114,14 +1114,14 @@ int ieee80211_register_hw(struct ieee802

        if (result)
                goto fail_flows;
  
        if (result)
                goto fail_flows;
  


@@ -35,7 +35,7 @@
        local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
        result = register_inet6addr_notifier(&local->ifa6_notifier);
        if (result)
        local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
        result = register_inet6addr_notifier(&local->ifa6_notifier);
        if (result)

-@@ -1131,13 +1131,13 @@ int ieee80211_register_hw(struct ieee802
+@@ -1130,13 +1130,13 @@ int ieee80211_register_hw(struct ieee802

  
        return 0;
  
  
        return 0;
  


@@ -52,7 +52,7 @@
   fail_ifa:
  #endif
        ieee80211_txq_teardown_flows(local);
   fail_ifa:
  #endif
        ieee80211_txq_teardown_flows(local);

-@@ -1167,10 +1167,10 @@ void ieee80211_unregister_hw(struct ieee
+@@ -1166,10 +1166,10 @@ void ieee80211_unregister_hw(struct ieee

        tasklet_kill(&local->tx_pending_tasklet);
        tasklet_kill(&local->tasklet);
  
        tasklet_kill(&local->tx_pending_tasklet);
        tasklet_kill(&local->tasklet);
  

diff --git a/package/kernel/mac80211/patches/210-ap_scan.patch b/package/kernel/mac80211/patches/210-ap_scan.patch
index e9999e32b916673ce7b8491e256df9caf5e3a9ea..8ade963c9f909d41073a5446c5faf4bf2e9d1b49 100644 (file)
--- a/package/kernel/mac80211/patches/210-ap_scan.patch
+++ b/package/kernel/mac80211/patches/210-ap_scan.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c

-@@ -2212,7 +2212,7 @@ static int ieee80211_scan(struct wiphy *
+@@ -2215,7 +2215,7 @@ static int ieee80211_scan(struct wiphy *

                 * the  frames sent while scanning on other channel will be
                 * lost)
                 */
                 * the  frames sent while scanning on other channel will be
                 * lost)
                 */

diff --git a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
index baaca173c7bc4d3fab4cd30b9351353d43fb56b8..934e2e122c2b7f3dd279e456f78216cbf5de24f5 100644 (file)
--- a/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
+++ b/package/kernel/mac80211/patches/307-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
@@ -48,7 +48,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
        if (likely(sta)) {
                if (!IS_ERR(sta))
                        tx->sta = sta;
        if (likely(sta)) {
                if (!IS_ERR(sta))
                        tx->sta = sta;

-@@ -3434,6 +3434,7 @@ begin:
+@@ -3468,6 +3468,7 @@ begin:

        tx.local = local;
        tx.skb = skb;
        tx.sdata = vif_to_sdata(info->control.vif);
        tx.local = local;
        tx.skb = skb;
        tx.sdata = vif_to_sdata(info->control.vif);


@@ -56,7 +56,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  
        if (txq->sta)
                tx.sta = container_of(txq->sta, struct sta_info, sta);
  
        if (txq->sta)
                tx.sta = container_of(txq->sta, struct sta_info, sta);

-@@ -3756,6 +3757,7 @@ ieee80211_build_data_template(struct iee
+@@ -3790,6 +3791,7 @@ ieee80211_build_data_template(struct iee

        hdr = (void *)skb->data;
        tx.sta = sta_info_get(sdata, hdr->addr1);
        tx.skb = skb;
        hdr = (void *)skb->data;
        tx.sta = sta_info_get(sdata, hdr->addr1);
        tx.skb = skb;

diff --git a/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
index 762458ba789831188c200217930d0cbbaed1c255..a9f01b368de3cf82d48d045e274b18423cb91f61 100644 (file)
--- a/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
+++ b/package/kernel/mac80211/patches/308-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
@@ -23,9 +23,9 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
 
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
 
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h

-@@ -2056,6 +2056,9 @@ struct ieee80211_txq {
-  *    The stack will not do fragmentation.
-  *    The callback for @set_frag_threshold should be set as well.
+@@ -2059,6 +2059,9 @@ struct ieee80211_txq {
+  * @IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA: Hardware supports buffer STA on
+  *    TDLS links.

   *
 + * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
 + *    Padding will be added after ieee80211_hdr, before IV/LLC.
   *
 + * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
 + *    Padding will be added after ieee80211_hdr, before IV/LLC.


@@ -33,27 +33,27 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
   * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
   */
  enum ieee80211_hw_flags {
   * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
   */
  enum ieee80211_hw_flags {

-@@ -2098,6 +2101,7 @@ enum ieee80211_hw_flags {
-       IEEE80211_HW_TX_FRAG_LIST,
+@@ -2102,6 +2105,7 @@ enum ieee80211_hw_flags {

        IEEE80211_HW_REPORTS_LOW_ACK,
        IEEE80211_HW_SUPPORTS_TX_FRAG,
        IEEE80211_HW_REPORTS_LOW_ACK,
        IEEE80211_HW_SUPPORTS_TX_FRAG,

+       IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA,

 +      IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
  
        /* keep last, obviously */
        NUM_IEEE80211_HW_FLAGS
 --- a/net/mac80211/debugfs.c
 +++ b/net/mac80211/debugfs.c
 +      IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
  
        /* keep last, obviously */
        NUM_IEEE80211_HW_FLAGS
 --- a/net/mac80211/debugfs.c
 +++ b/net/mac80211/debugfs.c

-@@ -211,6 +211,7 @@ static const char *hw_flag_names[] = {
-       FLAG(TX_FRAG_LIST),
+@@ -212,6 +212,7 @@ static const char *hw_flag_names[] = {

        FLAG(REPORTS_LOW_ACK),
        FLAG(SUPPORTS_TX_FRAG),
        FLAG(REPORTS_LOW_ACK),
        FLAG(SUPPORTS_TX_FRAG),

+       FLAG(SUPPORTS_TDLS_BUFFER_STA),

 +      FLAG(NEEDS_ALIGNED4_SKBS),
  #undef FLAG
  };
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
 +      FLAG(NEEDS_ALIGNED4_SKBS),
  #undef FLAG
  };
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h

-@@ -1547,6 +1547,29 @@ ieee80211_vif_get_num_mcast_if(struct ie
+@@ -1548,6 +1548,29 @@ ieee80211_vif_get_num_mcast_if(struct ie

        return -1;
  }
  
        return -1;
  }
  


@@ -85,7 +85,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
                                     unsigned int mpdu_len,
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h
                                     unsigned int mpdu_len,
 --- a/net/mac80211/sta_info.h
 +++ b/net/mac80211/sta_info.h

-@@ -290,7 +290,7 @@ struct ieee80211_fast_tx {
+@@ -300,7 +300,7 @@ struct ieee80211_fast_tx {

        u8 hdr_len;
        u8 sa_offs, da_offs, pn_offs;
        u8 band;
        u8 hdr_len;
        u8 sa_offs, da_offs, pn_offs;
        u8 band;


@@ -147,7 +147,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  
        if (likely(sta)) {
                if (!IS_ERR(sta))
  
        if (likely(sta)) {
                if (!IS_ERR(sta))

-@@ -2150,7 +2149,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
+@@ -2184,7 +2183,7 @@ netdev_tx_t ieee80211_monitor_start_xmit

                goto fail;
  
        hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
                goto fail;
  
        hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);


@@ -156,7 +156,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  
        if (skb->len < len_rthdr + hdrlen)
                goto fail;
  
        if (skb->len < len_rthdr + hdrlen)
                goto fail;

-@@ -2368,7 +2367,7 @@ static struct sk_buff *ieee80211_build_h
+@@ -2402,7 +2401,7 @@ static struct sk_buff *ieee80211_build_h

        struct ieee80211_chanctx_conf *chanctx_conf;
        struct ieee80211_sub_if_data *ap_sdata;
        enum nl80211_band band;
        struct ieee80211_chanctx_conf *chanctx_conf;
        struct ieee80211_sub_if_data *ap_sdata;
        enum nl80211_band band;


@@ -165,7 +165,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  
        if (IS_ERR(sta))
                sta = NULL;
  
        if (IS_ERR(sta))
                sta = NULL;

-@@ -2588,6 +2587,9 @@ static struct sk_buff *ieee80211_build_h
+@@ -2622,6 +2621,9 @@ static struct sk_buff *ieee80211_build_h

                hdrlen += 2;
        }
  
                hdrlen += 2;
        }
  


@@ -175,7 +175,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
        /*
         * Drop unicast frames to unauthorised stations unless they are
         * EAPOL frames from the local station.
        /*
         * Drop unicast frames to unauthorised stations unless they are
         * EAPOL frames from the local station.

-@@ -2668,6 +2670,7 @@ static struct sk_buff *ieee80211_build_h
+@@ -2702,6 +2704,7 @@ static struct sk_buff *ieee80211_build_h

  
        skb_pull(skb, skip_header_bytes);
        head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
  
        skb_pull(skb, skip_header_bytes);
        head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);


@@ -183,7 +183,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
  
        /*
         * So we need to modify the skb header and hence need a copy of
  
        /*
         * So we need to modify the skb header and hence need a copy of

-@@ -2700,6 +2703,9 @@ static struct sk_buff *ieee80211_build_h
+@@ -2734,6 +2737,9 @@ static struct sk_buff *ieee80211_build_h

                memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
  #endif
  
                memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
  #endif
  


@@ -193,7 +193,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
        if (ieee80211_is_data_qos(fc)) {
                __le16 *qos_control;
  
        if (ieee80211_is_data_qos(fc)) {
                __le16 *qos_control;
  

-@@ -2875,6 +2881,9 @@ void ieee80211_check_fast_xmit(struct st
+@@ -2909,6 +2915,9 @@ void ieee80211_check_fast_xmit(struct st

                fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
        }
  
                fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
        }
  


@@ -203,7 +203,7 @@ Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
        /* We store the key here so there's no point in using rcu_dereference()
         * but that's fine because the code that changes the pointers will call
         * this function after doing so. For a single CPU that would be enough,
        /* We store the key here so there's no point in using rcu_dereference()
         * but that's fine because the code that changes the pointers will call
         * this function after doing so. For a single CPU that would be enough,

-@@ -3461,7 +3470,7 @@ begin:
+@@ -3495,7 +3504,7 @@ begin:

  
                if (tx.key &&
                    (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV))
  
                if (tx.key &&
                    (tx.key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV))

diff --git a/package/kernel/mac80211/patches/317-Revert-ath10k-disable-wake_tx_queue-for-older-device.patch b/package/kernel/mac80211/patches/317-Revert-ath10k-disable-wake_tx_queue-for-older-device.patch
index 5e18f285ab7fd40cc8c5def9e1266acd46126f80..56d86c1525ac30dd51a1f35285ead4e1b013943f 100644 (file)
--- a/package/kernel/mac80211/patches/317-Revert-ath10k-disable-wake_tx_queue-for-older-device.patch
+++ b/package/kernel/mac80211/patches/317-Revert-ath10k-disable-wake_tx_queue-for-older-device.patch
@@ -9,7 +9,7 @@ in the hope that we've fixed all the performance problems now.
 
 --- a/drivers/net/wireless/ath/ath10k/mac.c
 +++ b/drivers/net/wireless/ath/ath10k/mac.c
 
 --- a/drivers/net/wireless/ath/ath10k/mac.c
 +++ b/drivers/net/wireless/ath/ath10k/mac.c

-@@ -8286,15 +8286,6 @@ int ath10k_mac_register(struct ath10k *a
+@@ -8319,15 +8319,6 @@ int ath10k_mac_register(struct ath10k *a

                        ath10k_warn(ar, "failed to initialise DFS pattern detector\n");
        }
  
                        ath10k_warn(ar, "failed to initialise DFS pattern detector\n");
        }
  

diff --git a/package/kernel/mac80211/patches/318-ath10k-fix-build-errors-with-CONFIG_PM.patch b/package/kernel/mac80211/patches/318-ath10k-fix-build-errors-with-CONFIG_PM.patch
new file mode 100644 (file)
index 0000000..2aeb49d
--- /dev/null
+++ b/package/kernel/mac80211/patches/318-ath10k-fix-build-errors-with-CONFIG_PM.patch
@@ -0,0 +1,72 @@
+From: Brian Norris <briannorris@chromium.org>
+Date: Thu, 19 Oct 2017 11:45:19 -0700
+Subject: [PATCH] ath10k: fix build errors with !CONFIG_PM
+
+Build errors have been reported with CONFIG_PM=n:
+
+drivers/net/wireless/ath/ath10k/pci.c:3416:8: error: implicit
+declaration of function 'ath10k_pci_suspend'
+[-Werror=implicit-function-declaration]
+
+drivers/net/wireless/ath/ath10k/pci.c:3428:8: error: implicit
+declaration of function 'ath10k_pci_resume'
+[-Werror=implicit-function-declaration]
+
+These are caused by the combination of the following two commits:
+
+6af1de2e4ec4 ("ath10k: mark PM functions as __maybe_unused")
+96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but
+disabled")
+
+Both build fine on their own.
+
+But now that ath10k_pci_pm_{suspend,resume}() is compiled
+unconditionally, we should also compile ath10k_pci_{suspend,resume}()
+unconditionally.
+
+And drop the #ifdef around ath10k_pci_hif_{suspend,resume}() too; they
+are trivial (empty), so we're not saving much space by compiling them
+out. And the alternatives would be to sprinkle more __maybe_unused, or
+spread the #ifdef's further.
+
+Build tested with the following combinations:
+CONFIG_PM=y && CONFIG_PM_SLEEP=y
+CONFIG_PM=y && CONFIG_PM_SLEEP=n
+CONFIG_PM=n
+
+Fixes: 96378bd2c6cd ("ath10k: fix core PCI suspend when WoWLAN is supported but disabled")
+Fixes: 096ad2a15fd8 ("Merge branch 'ath-next'")
+Signed-off-by: Brian Norris <briannorris@chromium.org>
+Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
+---
+
+--- a/drivers/net/wireless/ath/ath10k/pci.c
++++ b/drivers/net/wireless/ath/ath10k/pci.c
+@@ -2577,8 +2577,6 @@ void ath10k_pci_hif_power_down(struct at
+        */
+ }
+ 
+-#ifdef CONFIG_PM
+-
+ static int ath10k_pci_hif_suspend(struct ath10k *ar)
+ {
+       /* Nothing to do; the important stuff is in the driver suspend. */
+@@ -2627,7 +2625,6 @@ static int ath10k_pci_resume(struct ath1
+ 
+       return ret;
+ }
+-#endif
+ 
+ static bool ath10k_pci_validate_cal(void *data, size_t size)
+ {
+@@ -2782,10 +2779,8 @@ static const struct ath10k_hif_ops ath10
+       .power_down             = ath10k_pci_hif_power_down,
+       .read32                 = ath10k_pci_read32,
+       .write32                = ath10k_pci_write32,
+-#ifdef CONFIG_PM
+       .suspend                = ath10k_pci_hif_suspend,
+       .resume                 = ath10k_pci_hif_resume,
+-#endif
+       .fetch_cal_eeprom       = ath10k_pci_hif_fetch_cal_eeprom,
+ };
+ 

diff --git a/package/kernel/mac80211/patches/319-ath10k-fix-recent-bandwidth-conversion-bug.patch b/package/kernel/mac80211/patches/319-ath10k-fix-recent-bandwidth-conversion-bug.patch
new file mode 100644 (file)
index 0000000..5d5329f
--- /dev/null
+++ b/package/kernel/mac80211/patches/319-ath10k-fix-recent-bandwidth-conversion-bug.patch
@@ -0,0 +1,61 @@
+From: Christian Lamparter <chunkeey@gmail.com>
+Date: Wed, 1 Nov 2017 21:01:57 +0100
+Subject: [PATCH] ath10k: fix recent bandwidth conversion bug
+
+The commit "cfg80211: make RATE_INFO_BW_20 the default" changed
+the index of RATE_INFO_BW_20, but the updates to ath10k missed
+the special bandwidth calculation case in
+ath10k_update_per_peer_tx_stats().
+
+Fixes: 842be75c77cb ("cfg80211: make RATE_INFO_BW_20 the default")
+Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
+Patchwork-Id: 10037035
+Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
+---
+
+--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
+@@ -592,6 +592,9 @@ struct amsdu_subframe_hdr {
+ 
+ #define GROUP_ID_IS_SU_MIMO(x) ((x) == 0 || (x) == 63)
+ 
++static const u8 ath10k_bw_to_mac80211[] = { RATE_INFO_BW_20, RATE_INFO_BW_40,
++      RATE_INFO_BW_80, RATE_INFO_BW_160 };
++
+ static void ath10k_htt_rx_h_rates(struct ath10k *ar,
+                                 struct ieee80211_rx_status *status,
+                                 struct htt_rx_desc *rxd)
+@@ -694,23 +697,7 @@ static void ath10k_htt_rx_h_rates(struct
+               if (sgi)
+                       status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
+ 
+-              switch (bw) {
+-              /* 20MHZ */
+-              case 0:
+-                      break;
+-              /* 40MHZ */
+-              case 1:
+-                      status->bw = RATE_INFO_BW_40;
+-                      break;
+-              /* 80MHZ */
+-              case 2:
+-                      status->bw = RATE_INFO_BW_80;
+-                      break;
+-              case 3:
+-                      status->bw = RATE_INFO_BW_160;
+-                      break;
+-              }
+-
++              status->bw = ath10k_bw_to_mac80211[bw];
+               status->encoding = RX_ENC_VHT;
+               break;
+       default:
+@@ -2297,7 +2284,7 @@ ath10k_update_per_peer_tx_stats(struct a
+               arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
+ 
+       arsta->txrate.nss = txrate.nss;
+-      arsta->txrate.bw = txrate.bw + RATE_INFO_BW_20;
++      arsta->txrate.bw = ath10k_bw_to_mac80211[txrate.bw];
+ }
+ 
+ static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,

diff --git a/package/kernel/mac80211/patches/327-mac80211-accept-key-reinstall-without-changing-anyth.patch b/package/kernel/mac80211/patches/327-mac80211-accept-key-reinstall-without-changing-anyth.patch
deleted file mode 100644 (file)
index 7d0be03..0000000
--- a/package/kernel/mac80211/patches/327-mac80211-accept-key-reinstall-without-changing-anyth.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From fdf7cb4185b60c68e1a75e61691c4afdc15dea0e Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Tue, 5 Sep 2017 14:54:54 +0200
-Subject: [PATCH] mac80211: accept key reinstall without changing anything
-
-When a key is reinstalled we can reset the replay counters
-etc. which can lead to nonce reuse and/or replay detection
-being impossible, breaking security properties, as described
-in the "KRACK attacks".
-
-In particular, CVE-2017-13080 applies to GTK rekeying that
-happened in firmware while the host is in D3, with the second
-part of the attack being done after the host wakes up. In
-this case, the wpa_supplicant mitigation isn't sufficient
-since wpa_supplicant doesn't know the GTK material.
-
-In case this happens, simply silently accept the new key
-coming from userspace but don't take any action on it since
-it's the same key; this keeps the PN replay counters intact.
-
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/key.c | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/net/mac80211/key.c b/net/mac80211/key.c
-index a98fc2b5e0dc..ae995c8480db 100644
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -4,7 +4,7 @@
-  * Copyright 2006-2007        Jiri Benc <jbenc@suse.cz>
-  * Copyright 2007-2008        Johannes Berg <johannes@sipsolutions.net>
-  * Copyright 2013-2014  Intel Mobile Communications GmbH
-- * Copyright 2015     Intel Deutschland GmbH
-+ * Copyright 2015-2017        Intel Deutschland GmbH
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License version 2 as
-@@ -620,9 +620,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
- 
-       pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
-       idx = key->conf.keyidx;
--      key->local = sdata->local;
--      key->sdata = sdata;
--      key->sta = sta;
- 
-       mutex_lock(&sdata->local->key_mtx);
- 
-@@ -633,6 +630,21 @@ int ieee80211_key_link(struct ieee80211_key *key,
-       else
-               old_key = key_mtx_dereference(sdata->local, sdata->keys[idx]);
- 
-+      /*
-+       * Silently accept key re-installation without really installing the
-+       * new version of the key to avoid nonce reuse or replay issues.
-+       */
-+      if (old_key && key->conf.keylen == old_key->conf.keylen &&
-+          !memcmp(key->conf.key, old_key->conf.key, key->conf.keylen)) {
-+              ieee80211_key_free_unused(key);
-+              ret = 0;
-+              goto out;
-+      }
-+
-+      key->local = sdata->local;
-+      key->sdata = sdata;
-+      key->sta = sta;
-+
-       increment_tailroom_need_count(sdata);
- 
-       ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
-@@ -648,6 +660,7 @@ int ieee80211_key_link(struct ieee80211_key *key,
-               ret = 0;
-       }
- 
-+ out:
-       mutex_unlock(&sdata->local->key_mtx);
- 
-       return ret;
--- 
-2.13.6
-

diff --git a/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch b/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
deleted file mode 100644 (file)
index 03e8201..0000000
--- a/package/kernel/mac80211/patches/328-mac80211-use-constant-time-comparison-with-keys.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2bdd713b92a9cade239d3c7d15205a09f556624d Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 17 Oct 2017 20:32:07 +0200
-Subject: [PATCH] mac80211: use constant time comparison with keys
-
-Otherwise we risk leaking information via timing side channel.
-
-Fixes: fdf7cb4185b6 ("mac80211: accept key reinstall without changing anything")
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/key.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -19,6 +19,7 @@
- #include <linux/slab.h>
- #include <linux/export.h>
- #include <net/mac80211.h>
-+#include <crypto/algapi.h>
- #include <asm/unaligned.h>
- #include "ieee80211_i.h"
- #include "driver-ops.h"
-@@ -635,7 +636,7 @@ int ieee80211_key_link(struct ieee80211_
-        * new version of the key to avoid nonce reuse or replay issues.
-        */
-       if (old_key && key->conf.keylen == old_key->conf.keylen &&
--          !memcmp(key->conf.key, old_key->conf.key, key->conf.keylen)) {
-+          !crypto_memneq(key->conf.key, old_key->conf.key, key->conf.keylen)) {
-               ieee80211_key_free_unused(key);
-               ret = 0;
-               goto out;

diff --git a/package/kernel/mac80211/patches/329-mac80211-don-t-compare-TKIP-TX-MIC-key-in-reinstall.patch b/package/kernel/mac80211/patches/329-mac80211-don-t-compare-TKIP-TX-MIC-key-in-reinstall.patch
deleted file mode 100644 (file)
index 1eaf51d..0000000
--- a/package/kernel/mac80211/patches/329-mac80211-don-t-compare-TKIP-TX-MIC-key-in-reinstall.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From cfbb0d90a7abb289edc91833d0905931f8805f12 Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Tue, 24 Oct 2017 21:12:13 +0200
-Subject: [PATCH] mac80211: don't compare TKIP TX MIC key in reinstall prevention
-
-For the reinstall prevention, the code I had added compares the
-whole key. It turns out though that iwlwifi firmware doesn't
-provide the TKIP TX MIC key as it's not needed in client mode,
-and thus the comparison will always return false.
-
-For client mode, thus always zero out the TX MIC key part before
-doing the comparison in order to avoid accepting the reinstall
-of the key with identical encryption and RX MIC key, but not the
-same TX MIC key (since the supplicant provides the real one.)
-
-Fixes: fdf7cb4185b6 ("mac80211: accept key reinstall without changing anything")
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/key.c | 36 ++++++++++++++++++++++++++++++++++--
- 1 file changed, 34 insertions(+), 2 deletions(-)
-
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -610,6 +610,39 @@ void ieee80211_key_free_unused(struct ie
-       ieee80211_key_free_common(key);
- }
- 
-+static bool ieee80211_key_identical(struct ieee80211_sub_if_data *sdata,
-+                                  struct ieee80211_key *old,
-+                                  struct ieee80211_key *new)
-+{
-+      u8 tkip_old[WLAN_KEY_LEN_TKIP], tkip_new[WLAN_KEY_LEN_TKIP];
-+      u8 *tk_old, *tk_new;
-+
-+      if (!old || new->conf.keylen != old->conf.keylen)
-+              return false;
-+
-+      tk_old = old->conf.key;
-+      tk_new = new->conf.key;
-+
-+      /*
-+       * In station mode, don't compare the TX MIC key, as it's never used
-+       * and offloaded rekeying may not care to send it to the host. This
-+       * is the case in iwlwifi, for example.
-+       */
-+      if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-+          new->conf.cipher == WLAN_CIPHER_SUITE_TKIP &&
-+          new->conf.keylen == WLAN_KEY_LEN_TKIP &&
-+          !(new->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
-+              memcpy(tkip_old, tk_old, WLAN_KEY_LEN_TKIP);
-+              memcpy(tkip_new, tk_new, WLAN_KEY_LEN_TKIP);
-+              memset(tkip_old + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY, 0, 8);
-+              memset(tkip_new + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY, 0, 8);
-+              tk_old = tkip_old;
-+              tk_new = tkip_new;
-+      }
-+
-+      return !crypto_memneq(tk_old, tk_new, new->conf.keylen);
-+}
-+
- int ieee80211_key_link(struct ieee80211_key *key,
-                      struct ieee80211_sub_if_data *sdata,
-                      struct sta_info *sta)
-@@ -635,8 +668,7 @@ int ieee80211_key_link(struct ieee80211_
-        * Silently accept key re-installation without really installing the
-        * new version of the key to avoid nonce reuse or replay issues.
-        */
--      if (old_key && key->conf.keylen == old_key->conf.keylen &&
--          !crypto_memneq(key->conf.key, old_key->conf.key, key->conf.keylen)) {
-+      if (ieee80211_key_identical(sdata, old_key, key)) {
-               ieee80211_key_free_unused(key);
-               ret = 0;
-               goto out;

diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
index fae9b55529aab25cf6261f18305b9456f411adfd..edd4ce26bf6bef2dab5c243f69670e225a04e59f 100644 (file)
--- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
@@ -106,7 +106,7 @@
        ---help---
 --- a/local-symbols
 +++ b/local-symbols
        ---help---
 --- a/local-symbols
 +++ b/local-symbols

-@@ -82,6 +82,7 @@ ADM8211=
+@@ -87,6 +87,7 @@ ADM8211=

  ATH_COMMON=
  WLAN_VENDOR_ATH=
  ATH_DEBUG=
  ATH_COMMON=
  WLAN_VENDOR_ATH=
  ATH_DEBUG=

diff --git a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
index 457c0cb28c3dc66824c8cc4ff7a158712814ae82..00be2ef98dd96c97aabd22431f62a88e6e76fbaa 100644 (file)
--- a/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
+++ b/package/kernel/mac80211/patches/404-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c

-@@ -2497,6 +2497,8 @@ void regulatory_hint_country_ie(struct w
+@@ -2860,6 +2860,8 @@ void regulatory_hint_country_ie(struct w

        enum environment_cap env = ENVIRON_ANY;
        struct regulatory_request *request = NULL, *lr;
  
        enum environment_cap env = ENVIRON_ANY;
        struct regulatory_request *request = NULL, *lr;
  


@@ -9,7 +9,7 @@
        /* IE len must be evenly divisible by 2 */
        if (country_ie_len & 0x01)
                return;
        /* IE len must be evenly divisible by 2 */
        if (country_ie_len & 0x01)
                return;

-@@ -2703,6 +2705,7 @@ static void restore_regulatory_settings(
+@@ -3066,6 +3068,7 @@ static void restore_regulatory_settings(

  
  void regulatory_hint_disconnect(void)
  {
  
  void regulatory_hint_disconnect(void)
  {

diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
index 72857a0dbf875767aea18209143c9ee1b4678a26..2a2d2f3cdebd27a98293add12617739cce4901a5 100644 (file)
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -36,7 +36,7 @@
        u8 ps_dtim_period;
 --- a/include/uapi/linux/nl80211.h
 +++ b/include/uapi/linux/nl80211.h
        u8 ps_dtim_period;
 --- a/include/uapi/linux/nl80211.h
 +++ b/include/uapi/linux/nl80211.h

-@@ -2149,6 +2149,9 @@ enum nl80211_commands {
+@@ -2153,6 +2153,9 @@ enum nl80211_commands {

   * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
   * @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
   *
   * @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
   * @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
   *


@@ -46,7 +46,7 @@
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use
   * @NUM_NL80211_ATTR: total number of nl80211_attrs available
   * @NL80211_ATTR_MAX: highest attribute number currently defined
   * @__NL80211_ATTR_AFTER_LAST: internal use

-@@ -2575,6 +2578,8 @@ enum nl80211_attrs {
+@@ -2579,6 +2582,8 @@ enum nl80211_attrs {

        NL80211_ATTR_PMKR0_NAME,
        NL80211_ATTR_PORT_AUTHORIZED,
  
        NL80211_ATTR_PMKR0_NAME,
        NL80211_ATTR_PORT_AUTHORIZED,
  


@@ -57,7 +57,7 @@
        __NL80211_ATTR_AFTER_LAST,
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
        __NL80211_ATTR_AFTER_LAST,
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c

-@@ -2444,6 +2444,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2447,6 +2447,19 @@ static int ieee80211_get_tx_power(struct

        return 0;
  }
  
        return 0;
  }
  


@@ -77,7 +77,7 @@
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
                                  const u8 *addr)
  {
  static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
                                  const u8 *addr)
  {

-@@ -3717,6 +3730,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -3720,6 +3733,7 @@ const struct cfg80211_ops mac80211_confi

        .set_wiphy_params = ieee80211_set_wiphy_params,
        .set_tx_power = ieee80211_set_tx_power,
        .get_tx_power = ieee80211_get_tx_power,
        .set_wiphy_params = ieee80211_set_wiphy_params,
        .set_tx_power = ieee80211_set_tx_power,
        .get_tx_power = ieee80211_get_tx_power,


@@ -87,7 +87,7 @@
        CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
        CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h

-@@ -1347,6 +1347,7 @@ struct ieee80211_local {
+@@ -1348,6 +1348,7 @@ struct ieee80211_local {

        int dynamic_ps_forced_timeout;
  
        int user_power_level; /* in dBm, for all interfaces */
        int dynamic_ps_forced_timeout;
  
        int user_power_level; /* in dBm, for all interfaces */

diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
index 7cf589485ed921732602204c0eaad11f476ae407..6dd03fd28a4fa617b79adad8db10c0f6b84c6ba5 100644 (file)
--- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
@@ -125,7 +125,7 @@
                REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
                REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -527,6 +527,11 @@ irqreturn_t ath_isr(int irq, void *dev)
+@@ -528,6 +528,11 @@ irqreturn_t ath_isr(int irq, void *dev)

        if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
                return IRQ_HANDLED;
  
        if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
                return IRQ_HANDLED;
  

diff --git a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
index 6d541d6a57d80196a0bb6775883fd3b7370ffccd..82b8109e069c5f89c493dd923e5ef0af6e259cd3 100644 (file)
--- a/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
+++ b/package/kernel/mac80211/patches/551-ath9k_ubnt_uap_plus_hsr.patch
@@ -17,7 +17,7 @@
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_hw *hw = sc->hw;
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_hw *hw = sc->hw;

-@@ -41,6 +44,11 @@ static int ath_set_channel(struct ath_so
+@@ -42,6 +45,11 @@ static int ath_set_channel(struct ath_so

        ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
                chan->center_freq, chandef->width);
  
        ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
                chan->center_freq, chandef->width);
  


@@ -27,7 +27,7 @@
 +      }
 +
        /* update survey stats for the old channel before switching */
 +      }
 +
        /* update survey stats for the old channel before switching */

-       spin_lock_bh(&common->cc_lock);
+       spin_lock_irqsave(&common->cc_lock, flags);

        ath_update_survey_stats(sc);
 --- /dev/null
 +++ b/drivers/net/wireless/ath/ath9k/hsr.c
        ath_update_survey_stats(sc);
 --- /dev/null
 +++ b/drivers/net/wireless/ath/ath9k/hsr.c


@@ -343,7 +343,7 @@
  
  u8 ath9k_parse_mpdudensity(u8 mpdudensity)
  {
  
  u8 ath9k_parse_mpdudensity(u8 mpdudensity)
  {

-@@ -648,6 +650,7 @@ void ath_reset_work(struct work_struct *
+@@ -649,6 +651,7 @@ void ath_reset_work(struct work_struct *

  static int ath9k_start(struct ieee80211_hw *hw)
  {
        struct ath_softc *sc = hw->priv;
  static int ath9k_start(struct ieee80211_hw *hw)
  {
        struct ath_softc *sc = hw->priv;


@@ -351,7 +351,7 @@
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;

-@@ -726,6 +729,11 @@ static int ath9k_start(struct ieee80211_
+@@ -727,6 +730,11 @@ static int ath9k_start(struct ieee80211_

                                          AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
        }
  
                                          AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
        }
  


@@ -386,7 +386,7 @@
  #endif /* _LINUX_ATH9K_PLATFORM_H */
 --- a/local-symbols
 +++ b/local-symbols
  #endif /* _LINUX_ATH9K_PLATFORM_H */
 --- a/local-symbols
 +++ b/local-symbols

-@@ -109,6 +109,7 @@ ATH9K_WOW=
+@@ -114,6 +114,7 @@ ATH9K_WOW=

  ATH9K_RFKILL=
  ATH9K_CHANNEL_CONTEXT=
  ATH9K_PCOEM=
  ATH9K_RFKILL=
  ATH9K_CHANNEL_CONTEXT=
  ATH9K_PCOEM=

diff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch
index 5ad99995c2862a5088eac3ccf58e92b1fb49f100..b0c5d5ba37b33a12c47dc1a296b9116ad16432b6 100644 (file)
--- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00eeprom.patch
@@ -1,6 +1,6 @@
 --- a/local-symbols
 +++ b/local-symbols
 --- a/local-symbols
 +++ b/local-symbols

-@@ -291,6 +291,7 @@ RT2X00_LIB_FIRMWARE=
+@@ -296,6 +296,7 @@ RT2X00_LIB_FIRMWARE=

  RT2X00_LIB_CRYPTO=
  RT2X00_LIB_LEDS=
  RT2X00_LIB_DEBUGFS=
  RT2X00_LIB_CRYPTO=
  RT2X00_LIB_LEDS=
  RT2X00_LIB_DEBUGFS=

diff --git a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
index cfde08d4ea0890577c8bfa7b621289ff5f427e2c..885bc246babfaae1fc97833c4c11f006d511abe2 100644 (file)
--- a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
+++ b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/marvell/libertas/cfg.c
 +++ b/drivers/net/wireless/marvell/libertas/cfg.c
 --- a/drivers/net/wireless/marvell/libertas/cfg.c
 +++ b/drivers/net/wireless/marvell/libertas/cfg.c

-@@ -2043,6 +2043,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
+@@ -2040,6 +2040,8 @@ struct wireless_dev *lbs_cfg_alloc(struc

                goto err_wiphy_new;
        }
  
                goto err_wiphy_new;
        }
  


@@ -11,7 +11,7 @@
   err_wiphy_new:
 --- a/drivers/net/wireless/marvell/libertas/main.c
 +++ b/drivers/net/wireless/marvell/libertas/main.c
   err_wiphy_new:
 --- a/drivers/net/wireless/marvell/libertas/main.c
 +++ b/drivers/net/wireless/marvell/libertas/main.c

-@@ -933,6 +933,7 @@ struct lbs_private *lbs_add_card(void *c
+@@ -930,6 +930,7 @@ struct lbs_private *lbs_add_card(void *c

                goto err_adapter;
        }
  
                goto err_adapter;
        }
  

diff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
index b26505de21694b95b2b65bff1ba7dad2f6d28796..089ad2fe789c918f72309e3604a808de8ae876dc 100644 (file)
--- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
+++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/marvell/libertas/cfg.c
 +++ b/drivers/net/wireless/marvell/libertas/cfg.c
 --- a/drivers/net/wireless/marvell/libertas/cfg.c
 +++ b/drivers/net/wireless/marvell/libertas/cfg.c

-@@ -2119,6 +2119,8 @@ int lbs_cfg_register(struct lbs_private
+@@ -2116,6 +2116,8 @@ int lbs_cfg_register(struct lbs_private

        wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
        wdev->wiphy->reg_notifier = lbs_reg_notifier;
  
        wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
        wdev->wiphy->reg_notifier = lbs_reg_notifier;
  

diff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
index 94a25b680da714f0c648a6c4a07573fc5f0503c0..3b1e9673bbb95d1783893780d3c2384841f87a8c 100644 (file)
--- a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
+++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
@@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
 
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
 
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c

-@@ -2445,6 +2445,16 @@ int ath10k_core_register(struct ath10k *
+@@ -2458,6 +2458,16 @@ int ath10k_core_register(struct ath10k *

        ar->chip_id = chip_id;
        queue_work(ar->workqueue, &ar->register_work);
  
        ar->chip_id = chip_id;
        queue_work(ar->workqueue, &ar->register_work);
  

diff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
index e0ab671760a946b83d0134d9424b1eef8e4fa2c1..21e7359bc96917d696ad163a126fc39e9d035fe1 100644 (file)
--- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
+++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/mac.c
 +++ b/drivers/net/wireless/ath/ath10k/mac.c
 --- a/drivers/net/wireless/ath/ath10k/mac.c
 +++ b/drivers/net/wireless/ath/ath10k/mac.c

-@@ -8067,6 +8067,21 @@ static int ath10k_mac_init_rd(struct ath
+@@ -8080,6 +8080,21 @@ static int ath10k_mac_init_rd(struct ath

        return 0;
  }
  
        return 0;
  }
  


@@ -22,7 +22,7 @@
  int ath10k_mac_register(struct ath10k *ar)
  {
        static const u32 cipher_suites[] = {
  int ath10k_mac_register(struct ath10k *ar)
  {
        static const u32 cipher_suites[] = {

-@@ -8308,6 +8323,12 @@ int ath10k_mac_register(struct ath10k *a
+@@ -8352,6 +8367,12 @@ int ath10k_mac_register(struct ath10k *a

  
        wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
  
  
        wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
  

diff --git a/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch b/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch
index 0af8025d9665551e0cac517c91c1110e1ae0ca72..ea30a9dfd6cdfe13606c364011ddd3c8213e6929 100644 (file)
--- a/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch
+++ b/package/kernel/mac80211/patches/936-ath10k-fix-otp-failure-result.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c

-@@ -757,7 +757,7 @@ static int ath10k_core_get_board_id_from
+@@ -770,7 +770,7 @@ static int ath10k_core_get_board_id_from

        if (ret) {
                ath10k_err(ar, "could not execute otp for board id check: %d\n",
                           ret);
        if (ret) {
                ath10k_err(ar, "could not execute otp for board id check: %d\n",
                           ret);