diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-05-24 22:24:34 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-30 17:41:45 +0200 |
| commit | 25fa8919b124f8d7585327988b2a0a4a325e87d6 (patch) | |
| tree | fad5ab3a0744958fa1cb3381f139981c90d766f1 /patches/0070-mac80211-fils.patch | |
| parent | 1cc5efe8e280d78b5552bfee88bdac257151d888 (diff) | |
patches: Make patches apply on top of kernel 5.2-rc6
The cordic.c file was moved and the driver from drivers/staging/rtlwifi/
was removed in mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0070-mac80211-fils.patch')
| -rw-r--r-- | patches/0070-mac80211-fils.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/0070-mac80211-fils.patch b/patches/0070-mac80211-fils.patch index d3f249c5..aa2d6051 100644 --- a/patches/0070-mac80211-fils.patch +++ b/patches/0070-mac80211-fils.patch @@ -2,17 +2,17 @@ +++ b/net/mac80211/fils_aead.c @@ -1,3 +1,4 @@ +#if LINUX_VERSION_IS_GEQ(4,3,0) + // SPDX-License-Identifier: GPL-2.0-only /* * FILS AEAD for (Re)Association Request/Response frames - * Copyright 2016, Qualcomm Atheros, Inc. -@@ -332,3 +333,4 @@ int fils_decrypt_assoc_resp(struct ieee8 +@@ -329,3 +330,4 @@ int fils_decrypt_assoc_resp(struct ieee8 *frame_len -= AES_BLOCK_SIZE; return 0; } +#endif --- a/net/mac80211/fils_aead.h +++ b/net/mac80211/fils_aead.h -@@ -10,10 +10,27 @@ +@@ -7,10 +7,27 @@ #ifndef FILS_AEAD_H #define FILS_AEAD_H @@ -42,7 +42,7 @@ #endif /* FILS_AEAD_H */ --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -573,7 +573,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_ +@@ -570,7 +570,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_ NL80211_FEATURE_MAC_ON_CREATE | NL80211_FEATURE_USERSPACE_MPM | NL80211_FEATURE_FULL_AP_CLIENT_STATE; |