From 13f219569d4c7d470e235d62bc61afa992ae7119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 16 Aug 2018 16:34:21 +0200 Subject: [PATCH] mac80211: brcmfmac: backport patch setting WIPHY_FLAG_HAVE_AP_SME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's an important hint for authenticator (e.g. hostapd) about hardware capabilities. Signed-off-by: Rafał Miłecki --- package/kernel/mac80211/Makefile | 2 +- ...fmac-set-WIPHY_FLAG_HAVE_AP_SME-flag.patch | 34 +++++++++++++++++++ ...gfs-entry-for-reading-firmware-capa.patch} | 0 ...upport-for-sysfs-initiated-coredump.patch} | 0 ...-user-provided-data-for-memdump-bef.patch} | 0 ...memory-dump-upon-firmware-halt-sign.patch} | 0 ...memory-dump-on-SDIO-firmware-halt-m.patch} | 0 ...-register-wiphy-s-during-module_init.patch | 2 +- 8 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-set-WIPHY_FLAG_HAVE_AP_SME-flag.patch rename package/kernel/mac80211/patches/{331-v4.18-0004-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch => 331-v4.18-0005-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch} (100%) rename package/kernel/mac80211/patches/{331-v4.18-0005-brcmfmac-add-support-for-sysfs-initiated-coredump.patch => 331-v4.18-0006-brcmfmac-add-support-for-sysfs-initiated-coredump.patch} (100%) rename package/kernel/mac80211/patches/{331-v4.18-0006-brcmfmac-validate-user-provided-data-for-memdump-bef.patch => 331-v4.18-0007-brcmfmac-validate-user-provided-data-for-memdump-bef.patch} (100%) rename package/kernel/mac80211/patches/{331-v4.18-0007-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch => 331-v4.18-0008-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch} (100%) rename package/kernel/mac80211/patches/{331-v4.18-0008-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch => 331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch} (100%) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index e6b0793018..d65038ccc0 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=2017-01-31 -PKG_RELEASE:=13 +PKG_RELEASE:=14 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_BACKPORT_VERSION:= PKG_HASH:=75e6d39e34cf156212a2509172a4a62b673b69eb4a1d9aaa565f7fa719fa2317 diff --git a/package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-set-WIPHY_FLAG_HAVE_AP_SME-flag.patch b/package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-set-WIPHY_FLAG_HAVE_AP_SME-flag.patch new file mode 100644 index 0000000000..75807042b4 --- /dev/null +++ b/package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-set-WIPHY_FLAG_HAVE_AP_SME-flag.patch @@ -0,0 +1,34 @@ +From 1204aa17f3b4f63e67ac9b7c9afa9496485969c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Thu, 10 May 2018 15:21:39 +0200 +Subject: [PATCH] brcmfmac: set WIPHY_FLAG_HAVE_AP_SME flag +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +brcmfmac is a FullMAC driver and it implements/uses cfg80211 interface +for stations management. At the same time it doesn't receive or pass up +management frames. + +This flag indicates that authenticator doesn't have to subscribe to or +handle management frames. Some authenticators (e.g. hostapd) were +working with brcmfmac thanks to some extra assumptions. This commit +clears up the situation. + +Signed-off-by: Rafał Miłecki +Acked-by: Arend van Spriel +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -6485,6 +6485,7 @@ static int brcmf_setup_wiphy(struct wiph + BIT(NL80211_BSS_SELECT_ATTR_RSSI_ADJUST); + + wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT | ++ WIPHY_FLAG_HAVE_AP_SME | + WIPHY_FLAG_OFFCHAN_TX | + WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; + if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_TDLS)) diff --git a/package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch b/package/kernel/mac80211/patches/331-v4.18-0005-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch similarity index 100% rename from package/kernel/mac80211/patches/331-v4.18-0004-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch rename to package/kernel/mac80211/patches/331-v4.18-0005-brcmfmac-add-debugfs-entry-for-reading-firmware-capa.patch diff --git a/package/kernel/mac80211/patches/331-v4.18-0005-brcmfmac-add-support-for-sysfs-initiated-coredump.patch b/package/kernel/mac80211/patches/331-v4.18-0006-brcmfmac-add-support-for-sysfs-initiated-coredump.patch similarity index 100% rename from package/kernel/mac80211/patches/331-v4.18-0005-brcmfmac-add-support-for-sysfs-initiated-coredump.patch rename to package/kernel/mac80211/patches/331-v4.18-0006-brcmfmac-add-support-for-sysfs-initiated-coredump.patch diff --git a/package/kernel/mac80211/patches/331-v4.18-0006-brcmfmac-validate-user-provided-data-for-memdump-bef.patch b/package/kernel/mac80211/patches/331-v4.18-0007-brcmfmac-validate-user-provided-data-for-memdump-bef.patch similarity index 100% rename from package/kernel/mac80211/patches/331-v4.18-0006-brcmfmac-validate-user-provided-data-for-memdump-bef.patch rename to package/kernel/mac80211/patches/331-v4.18-0007-brcmfmac-validate-user-provided-data-for-memdump-bef.patch diff --git a/package/kernel/mac80211/patches/331-v4.18-0007-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch b/package/kernel/mac80211/patches/331-v4.18-0008-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch similarity index 100% rename from package/kernel/mac80211/patches/331-v4.18-0007-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch rename to package/kernel/mac80211/patches/331-v4.18-0008-brcmfmac-trigger-memory-dump-upon-firmware-halt-sign.patch diff --git a/package/kernel/mac80211/patches/331-v4.18-0008-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch b/package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch similarity index 100% rename from package/kernel/mac80211/patches/331-v4.18-0008-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch rename to package/kernel/mac80211/patches/331-v4.18-0009-brcmfmac-trigger-memory-dump-on-SDIO-firmware-halt-m.patch diff --git a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch index d86f06ad80..4f9d154b3f 100644 --- a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch +++ b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch @@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1301,6 +1301,7 @@ int __init brcmf_core_init(void) +@@ -1305,6 +1305,7 @@ int __init brcmf_core_init(void) { if (!schedule_work(&brcmf_driver_work)) return -EBUSY;