superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wifi: ieee80211: split NAN definitions out 

The ieee80211.h file has gotten very long, continue splitting
it by putting NAN definitions into a separate file. Note that
NAN isn't really even IEEE 802.11 but WFA.

Link: https://patch.msgid.link/20251105153843.8da0e796dda2.I7b2ce11220b70e8794019501eabbf8afbaf431a6@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
pull/1354/merge
Johannes Berg 2025-11-05 15:36:56 +01:00
parent fcd42b909b
commit 60a3734192
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/linux/ieee80211-nan.h Normal file
View File

@ -0,0 +1,35 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* WFA NAN definitions
*
* Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
* <jkmaline@cc.hut.fi>
* Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
* Copyright (c) 2005, Devicescape Software, Inc.
* Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
* Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH
* Copyright (c) 2016 - 2017 Intel Deutschland GmbH
* Copyright (c) 2018 - 2025 Intel Corporation
*/
#ifndef LINUX_IEEE80211_NAN_H
#define LINUX_IEEE80211_NAN_H
/* NAN operation mode, as defined in Wi-Fi Aware (TM) specification Table 81 */
#define NAN_OP_MODE_PHY_MODE_VHT 0x01
#define NAN_OP_MODE_PHY_MODE_HE 0x10
#define NAN_OP_MODE_PHY_MODE_MASK 0x11
#define NAN_OP_MODE_80P80MHZ 0x02
#define NAN_OP_MODE_160MHZ 0x04
#define NAN_OP_MODE_PNDL_SUPPRTED 0x08
/* NAN Device capabilities, as defined in Wi-Fi Aware (TM) specification
* Table 79
*/
#define NAN_DEV_CAPA_DFS_OWNER 0x01
#define NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED 0x02
#define NAN_DEV_CAPA_SIM_NDP_RX_SUPPORTED 0x04
#define NAN_DEV_CAPA_NDPE_SUPPORTED 0x08
#define NAN_DEV_CAPA_S3_SUPPORTED 0x10
#endif /* LINUX_IEEE80211_NAN_H */

18
include/linux/ieee80211.h
View File

@ -2803,23 +2803,6 @@ struct ieee80211_tbtt_info_ge_11 {
struct ieee80211_rnr_mld_params mld_params; struct ieee80211_rnr_mld_params mld_params;
} __packed; } __packed;
/* NAN operation mode, as defined in Wi-Fi Aware (TM) specification Table 81 */
#define NAN_OP_MODE_PHY_MODE_VHT 0x01
#define NAN_OP_MODE_PHY_MODE_HE 0x10
#define NAN_OP_MODE_PHY_MODE_MASK 0x11
#define NAN_OP_MODE_80P80MHZ 0x02
#define NAN_OP_MODE_160MHZ 0x04
#define NAN_OP_MODE_PNDL_SUPPRTED 0x08
/* NAN Device capabilities, as defined in Wi-Fi Aware (TM) specification
* Table 79
*/
#define NAN_DEV_CAPA_DFS_OWNER 0x01
#define NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED 0x02
#define NAN_DEV_CAPA_SIM_NDP_RX_SUPPORTED 0x04
#define NAN_DEV_CAPA_NDPE_SUPPORTED 0x08
#define NAN_DEV_CAPA_S3_SUPPORTED 0x10
#include "ieee80211-ht.h" #include "ieee80211-ht.h"
#include "ieee80211-vht.h" #include "ieee80211-vht.h"
#include "ieee80211-he.h" #include "ieee80211-he.h"
@ -2827,6 +2810,7 @@ struct ieee80211_tbtt_info_ge_11 {
#include "ieee80211-mesh.h" #include "ieee80211-mesh.h"
#include "ieee80211-s1g.h" #include "ieee80211-s1g.h"
#include "ieee80211-p2p.h" #include "ieee80211-p2p.h"
#include "ieee80211-nan.h"
/** /**
* ieee80211_check_tim - check if AID bit is set in TIM * ieee80211_check_tim - check if AID bit is set in TIM