Commit 60a37341 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent fcd42b90

include/linux/ieee80211-nan.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* 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 */

include/linux/ieee80211.h

+1 −17
Original line number Diff line number Diff line
@@ -2803,23 +2803,6 @@ struct ieee80211_tbtt_info_ge_11 { 
	struct ieee80211_rnr_mld_params mld_params;

} __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-vht.h"

#include "ieee80211-he.h"
@@ -2827,6 +2810,7 @@ struct ieee80211_tbtt_info_ge_11 { 
#include "ieee80211-mesh.h"

#include "ieee80211-s1g.h"

#include "ieee80211-p2p.h"

#include "ieee80211-nan.h"



/**

 * ieee80211_check_tim - check if AID bit is set in TIM