diff options
author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 23:29:00 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 23:29:00 +0300 |
commit | 53c716412708db7000e06292fb89b2609f9a48f7 (patch) | |
tree | 3ede481ee0926f0e53e14bba61028d307d58296c /drivers/net/wireless/marvell/mwifiex/main.h | |
parent | e6d64ce06c28b615ebfeab7b8bfad6136ea83095 (diff) | |
parent | aec256d0ecd561036f188dbc8fa7924c47a9edfd (diff) | |
download | linux-53c716412708db7000e06292fb89b2609f9a48f7.tar.xz |
Merge branch 'for-5.4/apple' into for-linus
- stuck 'fn' key fix for hid-apple from Joao Moreno
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/main.h')
-rw-r--r-- | drivers/net/wireless/marvell/mwifiex/main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 3e442c7f7882..095837fba300 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -124,6 +124,7 @@ enum { #define MWIFIEX_MAX_TOTAL_SCAN_TIME (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S) +#define WPA_GTK_OUI_OFFSET 2 #define RSN_GTK_OUI_OFFSET 2 #define MWIFIEX_OUI_NOT_PRESENT 0 |