mac80211-5.8: fix build on kernel 4.14 and sync upstream commit (#5295)

* mac80211-5.8: fix build on kernel 4.14

* mac80211: sync upstream commit

package/kernel/mac80211/ath.mk

@@ -275,6 +275,7 @@ define KernelPackage/ath10k/config
 
        config ATH10K_THERMAL
                bool "Enable thermal sensors and throttling support"
+               default y
                depends on PACKAGE_kmod-ath10k
 
 endef

package/kernel/mac80211/patches/subsys/600-fix-warning-in-6-ghz-ie-addition.patch

+From 65ad3ef9fced4062dfd74e2f89443fb5ce184321 Mon Sep 17 00:00:00 2001
+From: Rajkumar Manoharan <rmanohar@codeaurora.org>
+Date: Wed, 1 Jul 2020 19:20:24 -0700
+Subject: mac80211: fix warning in 6 GHz IE addition in mesh mode
+
+The commit 24a2042cb22f ("mac80211: add HE 6 GHz Band Capability
+element") failed to check device capability before adding HE 6 GHz
+capability element. Below warning is reported in 11ac device in mesh.
+Fix that by checking device capability at HE 6 GHz cap IE addition
+in mesh beacon and association request.
+
+WARNING: CPU: 1 PID: 1897 at net/mac80211/util.c:2878
+ieee80211_ie_build_he_6ghz_cap+0x149/0x150 [mac80211]
+[ 3138.720358] Call Trace:
+[ 3138.720361]  ieee80211_mesh_build_beacon+0x462/0x530 [mac80211]
+[ 3138.720363]  ieee80211_start_mesh+0xa8/0xf0 [mac80211]
+[ 3138.720365]  __cfg80211_join_mesh+0x122/0x3e0 [cfg80211]
+[ 3138.720368]  nl80211_join_mesh+0x3d3/0x510 [cfg80211]
+
+Fixes: 24a2042cb22f ("mac80211: add HE 6 GHz Band Capability element")
+Reported-by: Markus Theil <markus.theil@tu-ilmenau.de>
+Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org>
+Link: https://lore.kernel.org/r/1593656424-18240-1-git-send-email-rmanohar@codeaurora.org
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ net/mac80211/mesh.c | 13 +++++++++++++
+ net/mac80211/util.c |  4 ++++
+ 2 files changed, 17 insertions(+)
+
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
+@@ -617,6 +617,19 @@ int mesh_add_he_oper_ie(struct ieee80211
+ int mesh_add_he_6ghz_cap_ie(struct ieee80211_sub_if_data *sdata,
+ 			    struct sk_buff *skb)
+ {
++	struct ieee80211_supported_band *sband;
++	const struct ieee80211_sband_iftype_data *iftd;
++
++	sband = ieee80211_get_sband(sdata);
++	if (!sband)
++		return -EINVAL;
++
++	iftd = ieee80211_get_sband_iftype_data(sband,
++					       NL80211_IFTYPE_MESH_POINT);
++	/* The device doesn't support HE in mesh mode or at all */
++	if (!iftd)
++		return 0;
++
+ 	ieee80211_ie_build_he_6ghz_cap(sdata, skb);
+ 	return 0;
+ }
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -2878,6 +2878,10 @@ void ieee80211_ie_build_he_6ghz_cap(stru
+ 	if (WARN_ON(!iftd))
+ 		return;
+ 
++	/* Check for device HE 6 GHz capability before adding element */
++	if (!iftd->he_6ghz_capa.capa)
++		return;
++
+ 	cap = le16_to_cpu(iftd->he_6ghz_capa.capa);
+ 	cap &= ~IEEE80211_HE_6GHZ_CAP_SM_PS;
+ 

package/kernel/mac80211/patches/subsys/600-mac80211-util-don-t-warn-on-missing-sband-iftype-dat.patch

-From db6d1e942f5a2828e1245e16ceb997f537a2d1a4 Mon Sep 17 00:00:00 2001
-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 25 Jul 2020 01:43:26 +0200
-Subject: [PATCH] mac80211: util: don't warn on missing sband iftype data
-
-The kernel currently floods the ringbuffer with warnings when adding a
-mesh interface for a device not support HE 6GHz modes.
-
-Return without warning in this case, as mesh_add_he_6ghz_cap_ie calls
-ieee80211_ie_build_he_6ghz_cap regardless of the supported interface
-modes.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
----
- net/mac80211/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -2875,7 +2875,7 @@ void ieee80211_ie_build_he_6ghz_cap(stru
- 		return;
- 
- 	iftd = ieee80211_get_sband_iftype_data(sband, iftype);
--	if (WARN_ON(!iftd))
-+	if (!iftd)
- 		return;
- 
- 	cap = le16_to_cpu(iftd->he_6ghz_capa.capa);

package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch

+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -5177,6 +5177,14 @@ exit:
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT)
++static void cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
++						   struct wireless_dev *wdev,
++						   struct mgmt_frame_regs *upd)
++{
++
++}
++#else
+ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+         struct wireless_dev *wdev,
+@@ -5205,6 +5213,7 @@ static void cfg80211_rtw_mgmt_frame_regi
+ exit:
+ 	return;
+ }
++#endif
+ 
+ #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
+@@ -6019,7 +6028,10 @@ static struct cfg80211_ops rtw_cfg80211_
+ 	.cancel_remain_on_channel = cfg80211_rtw_cancel_remain_on_channel,
+ #endif
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) || defined(BUILD_OPENWRT)
++	.mgmt_tx = cfg80211_rtw_mgmt_tx,
++	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
+ 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
+ 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+ #elif  (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))

package/network/services/hostapd/Config.in

@@ -13,6 +13,7 @@ config WPA_RFKILL_SUPPORT
 		   PACKAGE_wpad-openssl || \
 		   PACKAGE_wpad-wolfssl || \
 		   PACKAGE_wpad-basic || \
+		   PACKAGE_wpad-basic-wolfssl || \
 		   PACKAGE_wpad-mini || \
 		   PACKAGE_wpad-mesh-openssl || \
 		   PACKAGE_wpad-mesh-wolfssl
@@ -32,6 +33,7 @@ config WPA_MSG_MIN_PRIORITY
 		   PACKAGE_wpad-openssl || \
 		   PACKAGE_wpad-wolfssl || \
 		   PACKAGE_wpad-basic || \
+		   PACKAGE_wpad-basic-wolfssl || \
 		   PACKAGE_wpad-mini || \
 		   PACKAGE_wpad-mesh-openssl || \
 		   PACKAGE_wpad-mesh-wolfssl
@@ -49,6 +51,7 @@ config WPA_WOLFSSL
 	bool
 	default PACKAGE_wpa-supplicant-wolfssl ||\
 	        PACKAGE_wpad-wolfssl ||\
+	        PACKAGE_wpad-basic-wolfssl || \
 	        PACKAGE_wpad-mesh-wolfssl ||\
 	        PACKAGE_eapol-test-wolfssl
 	select WOLFSSL_HAS_AES_CCM

package/network/services/hostapd/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
@@ -250,6 +250,17 @@ define Package/wpad-basic/description
  This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, 802.11r and 802.11w support.
 endef
 
+define Package/wpad-basic-wolfssl
+$(call Package/wpad/Default,$(1))
+  TITLE+= (wolfSSL, 11r, 11w)
+  VARIANT:=wpad-basic-wolfssl
+  DEPENDS+=+libwolfssl
+endef
+
+define Package/wpad-basic-wolfssl/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, SAE (WPA3-Personal), 802.11r and 802.11w support.
+endef
+
 define Package/wpad-mini
 $(call Package/wpad/Default,$(1))
   TITLE+= (WPA-PSK only)
@@ -575,6 +586,7 @@ define Package/wpad/install
 	$(LN) wpad $(1)/usr/sbin/wpa_supplicant
 endef
 Package/wpad-basic/install = $(Package/wpad/install)
+Package/wpad-basic-wolfssl/install = $(Package/wpad/install)
 Package/wpad-mini/install = $(Package/wpad/install)
 Package/wpad-openssl/install = $(Package/wpad/install)
 Package/wpad-wolfssl/install = $(Package/wpad/install)
@@ -630,6 +642,7 @@ $(eval $(call BuildPackage,wpad))
 $(eval $(call BuildPackage,wpad-mesh-openssl))
 $(eval $(call BuildPackage,wpad-mesh-wolfssl))
 $(eval $(call BuildPackage,wpad-basic))
+$(eval $(call BuildPackage,wpad-basic-wolfssl))
 $(eval $(call BuildPackage,wpad-mini))
 $(eval $(call BuildPackage,wpad-openssl))
 $(eval $(call BuildPackage,wpad-wolfssl))

package/network/services/hostapd/files/hostapd.sh

@@ -198,7 +198,7 @@ hostapd_common_add_bss_config() {
 	config_add_int eapol_version
 
 	config_add_string 'auth_server:host' 'server:host'
-	config_add_string auth_secret
+	config_add_string auth_secret key
 	config_add_int 'auth_port:port' 'port:port'
 
 	config_add_string acct_server
@@ -404,13 +404,13 @@ hostapd_set_bss_options() {
 		;;
 		psk|sae|psk-sae)
 			json_get_vars key wpa_psk_file
-			if [ ${#key} -lt 8 ]; then
-				wireless_setup_vif_failed INVALID_WPA_PSK
-				return 1
-			elif [ ${#key} -eq 64 ]; then
+			if [ ${#key} -eq 64 ]; then
 				append bss_conf "wpa_psk=$key" "$N"
-			else
+			elif [ ${#key} -ge 8 ] && [ ${#key} -le 63 ]; then
 				append bss_conf "wpa_passphrase=$key" "$N"
+			elif [ -n "$key" ] || [ -z "$wpa_psk_file" ]; then
+				wireless_setup_vif_failed INVALID_WPA_PSK
+				return 1
 			fi
 			[ -z "$wpa_psk_file" ] && set_default wpa_psk_file /var/run/hostapd-$ifname.psk
 			[ -n "$wpa_psk_file" ] && {

target/linux/generic/hack-4.14/951-mac80211-rx-function.patch

+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -3318,6 +3318,7 @@ int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb);
+ int netif_rx(struct sk_buff *skb);
+ int netif_rx_ni(struct sk_buff *skb);
+ int netif_receive_skb(struct sk_buff *skb);
++void netif_receive_skb_list(struct list_head *head);
+ gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb);
+ void napi_gro_flush(struct napi_struct *napi, bool flush_old);
+ struct sk_buff *napi_get_frags(struct napi_struct *napi);
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -1336,6 +1336,17 @@ static inline void skb_zcopy_abort(struct sk_buff *skb)
+ 	}
+ }
+ 
++static inline void skb_mark_no_on_list(struct sk_buff *skb)
++{
++	skb->next = NULL;
++}
++
++static inline void skb_list_del_init(struct sk_buff *skb)
++{
++	__list_del_entry(&skb->list);
++	skb_mark_no_on_list(skb);
++}
++
+ /**
+  *	skb_queue_empty - check if a queue is empty
+  *	@list: queue head