Few patches do not apply to source code in v4.17-rc1 so updating those. Signed-off-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx> --- patches/0004-disable-wext-kconfig.patch | 4 ++-- patches/0070-mac80211-fils.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/0004-disable-wext-kconfig.patch b/patches/0004-disable-wext-kconfig.patch index 313ea90..1ed420a 100644 --- a/patches/0004-disable-wext-kconfig.patch +++ b/patches/0004-disable-wext-kconfig.patch @@ -25,10 +25,10 @@ so remove the Kconfig options for them. config CFG80211 tristate "cfg80211 - wireless configuration API" depends on RFKILL || !RFKILL -@@ -191,7 +173,7 @@ config CFG80211_CRDA_SUPPORT +@@ -187,7 +169,7 @@ config CFG80211_CRDA_SUPPORT + config CFG80211_WEXT bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT - depends on CFG80211 - select WEXT_CORE + depends on WEXT_CORE default y if CFG80211_WEXT_EXPORT diff --git a/patches/0070-mac80211-fils.patch b/patches/0070-mac80211-fils.patch index 345e707..d7274e5 100644 --- a/patches/0070-mac80211-fils.patch +++ b/patches/0070-mac80211-fils.patch @@ -5,7 +5,7 @@ /* * FILS AEAD for (Re)Association Request/Response frames * Copyright 2016, Qualcomm Atheros, Inc. -@@ -332,3 +333,4 @@ int fils_decrypt_assoc_resp(struct ieee8 +@@ -332,3 +333,4 @@ int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata, *frame_len -= AES_BLOCK_SIZE; return 0; } @@ -42,13 +42,13 @@ #endif /* FILS_AEAD_H */ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -553,7 +553,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_ +@@ -553,7 +553,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, NL80211_FEATURE_MAC_ON_CREATE | NL80211_FEATURE_USERSPACE_MPM | NL80211_FEATURE_FULL_AP_CLIENT_STATE; +#if LINUX_VERSION_IS_GEQ(4,3,0) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA); +#endif + wiphy_ext_feature_set(wiphy, + NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211); - if (!ops->hw_scan) - wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN | -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in
