tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+36
-17
+35
include/linux/ieee80211-nan.h
+35
include/linux/ieee80211-nan.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0-only */
2
+
/*
3
+
* WFA NAN definitions
4
+
*
5
+
* Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
6
+
* <jkmaline@cc.hut.fi>
7
+
* Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
8
+
* Copyright (c) 2005, Devicescape Software, Inc.
9
+
* Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
10
+
* Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH
11
+
* Copyright (c) 2016 - 2017 Intel Deutschland GmbH
12
+
* Copyright (c) 2018 - 2025 Intel Corporation
13
+
*/
14
+
15
+
#ifndef LINUX_IEEE80211_NAN_H
16
+
#define LINUX_IEEE80211_NAN_H
17
+
18
+
/* NAN operation mode, as defined in Wi-Fi Aware (TM) specification Table 81 */
19
+
#define NAN_OP_MODE_PHY_MODE_VHT 0x01
20
+
#define NAN_OP_MODE_PHY_MODE_HE 0x10
21
+
#define NAN_OP_MODE_PHY_MODE_MASK 0x11
22
+
#define NAN_OP_MODE_80P80MHZ 0x02
23
+
#define NAN_OP_MODE_160MHZ 0x04
24
+
#define NAN_OP_MODE_PNDL_SUPPRTED 0x08
25
+
26
+
/* NAN Device capabilities, as defined in Wi-Fi Aware (TM) specification
27
+
* Table 79
28
+
*/
29
+
#define NAN_DEV_CAPA_DFS_OWNER 0x01
30
+
#define NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED 0x02
31
+
#define NAN_DEV_CAPA_SIM_NDP_RX_SUPPORTED 0x04
32
+
#define NAN_DEV_CAPA_NDPE_SUPPORTED 0x08
33
+
#define NAN_DEV_CAPA_S3_SUPPORTED 0x10
34
+
35
+
#endif /* LINUX_IEEE80211_NAN_H */
+1
-17
include/linux/ieee80211.h
+1
-17
include/linux/ieee80211.h
···
2803
2803
struct ieee80211_rnr_mld_params mld_params;
2804
2804
} __packed;
2805
2805
2806
-
/* NAN operation mode, as defined in Wi-Fi Aware (TM) specification Table 81 */
2807
-
#define NAN_OP_MODE_PHY_MODE_VHT 0x01
2808
-
#define NAN_OP_MODE_PHY_MODE_HE 0x10
2809
-
#define NAN_OP_MODE_PHY_MODE_MASK 0x11
2810
-
#define NAN_OP_MODE_80P80MHZ 0x02
2811
-
#define NAN_OP_MODE_160MHZ 0x04
2812
-
#define NAN_OP_MODE_PNDL_SUPPRTED 0x08
2813
-
2814
-
/* NAN Device capabilities, as defined in Wi-Fi Aware (TM) specification
2815
-
* Table 79
2816
-
*/
2817
-
#define NAN_DEV_CAPA_DFS_OWNER 0x01
2818
-
#define NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED 0x02
2819
-
#define NAN_DEV_CAPA_SIM_NDP_RX_SUPPORTED 0x04
2820
-
#define NAN_DEV_CAPA_NDPE_SUPPORTED 0x08
2821
-
#define NAN_DEV_CAPA_S3_SUPPORTED 0x10
2822
-
2823
2806
#include "ieee80211-ht.h"
2824
2807
#include "ieee80211-vht.h"
2825
2808
#include "ieee80211-he.h"
···
2810
2827
#include "ieee80211-mesh.h"
2811
2828
#include "ieee80211-s1g.h"
2812
2829
#include "ieee80211-p2p.h"
2830
+
#include "ieee80211-nan.h"
2813
2831
2814
2832
/**
2815
2833
* ieee80211_check_tim - check if AID bit is set in TIM