diff --git a/drivers/net/wireless/renesas/ra6w/cfg80211.h b/drivers/net/wireless/renesas/ra6w/cfg80211.h
new file mode 100644
index 000000000000..e4eda5898a6a
--- /dev/null
+++ b/drivers/net/wireless/renesas/ra6w/cfg80211.h
@@ -0,0 +1,266 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) [2022-2025] Renesas Electronics Corporation and/or its affiliates.
+ */
+
+#ifndef RA6W_CFG80211_H
+#define RA6W_CFG80211_H
+
+#include <net/cfg80211.h>
+
+#include "core.h"
+#include "stats.h"
+
+#define RA6W_CFG80211_CH_MAX_POWER		30
+#define RA6W_CFG80211_EXT_CAPA_MAX		10
+#define RA6W_CFG80211_CHANINFO_MAX		3
+#define RA6W_CFG80211_ROC_TX			5
+#define RA6W_CFG80211_STA_MAX			4
+#define RA6W_CFG80211_VIF_MAX			2
+#define RA6W_CFG80211_STA_TABLE_MAX		(RA6W_CFG80211_STA_MAX + RA6W_CFG80211_VIF_MAX)
+#define RA6W_CFG80211_NDEV_TXQ			1
+#define RA6W_CFG80211_NDEV_RXQ			1
+#define RA6W_CFG80211_LPCA_PPM			20
+#define RA6W_CFG80211_UAPSD_TIMEOUT		300
+#define RA6W_CFG80211_KEYS_MAX			6
+#define RA6W_CFG80211_WPI_SUBKEY_LEN		16
+#define RA6W_CFG80211_WPI_KEY_LEN		32
+#define RA6W_CFG80211_KEY_LEN_MAX		32
+#define RA6W_CFG80211_KEY_SEQ_LEN_MAX		8
+#define RA6W_CFG80211_CH_IDX_INVALID		0xFF
+#define RA6W_CFG80211_VIF_IDX_INVALID		0xFF
+#define RA6W_CFG80211_STA_IDX_INVALID		0xFF
+#define RA6W_CFG80211_TID_INVALID		0x1F
+#define RA6W_CFG80211_RESERVED_CIPHER_NUM	5
+
+enum ra6w_cfg80211_formatmod {
+	RA6W_CFG80211_FORMATMOD_NON_HT,
+	RA6W_CFG80211_FORMATMOD_NON_HT_DUP_OFDM,
+	RA6W_CFG80211_FORMATMOD_HT_MF,
+	RA6W_CFG80211_FORMATMOD_HT_GF,
+	RA6W_CFG80211_FORMATMOD_VHT,
+	RA6W_CFG80211_FORMATMOD_HE_SU,
+	RA6W_CFG80211_FORMATMOD_HE_MU,
+	RA6W_CFG80211_FORMATMOD_HE_ER,
+	RA6W_CFG80211_FORMATMOD_HE_TB,
+
+	RA6W_CFG80211_FORMATMOD_MAX
+};
+
+struct ra6w_cfg80211_legrate {
+	s16 idx;
+	u16 rate; // in 100Kbps
+};
+
+enum ra6w_cfg80211_vif_type {
+	RA6W_VIF_TYPE_STA,
+	RA6W_VIF_TYPE_IBSS,
+	RA6W_VIF_TYPE_AP,
+	RA6W_VIF_TYPE_MESH_POINT,
+	RA6W_VIF_TYPE_MONITOR,
+
+	RA6W_VIF_TYPE_MAX
+};
+
+enum ra6w_cfg80211_machw_support_type {
+	RA6W_MACHW_SUPPORT_DEFAULT = 10,
+	RA6W_MACHW_SUPPORT_HE = 20,
+	RA6W_MACHW_SUPPORT_AP_HE = 30,
+};
+
+enum ra6w_cfg80211_chipher_type {
+	RA6W_CIPHER_WEP40 = 0,
+	RA6W_CIPHER_TKIP = 1,
+	RA6W_CIPHER_CCMP = 2,
+	RA6W_CIPHER_WEP104 = 3,
+	RA6W_CIPHER_SMS4 = 4,
+	RA6W_CIPHER_AES_CMAC_128 = 5,
+	RA6W_CIPHER_GCMP_128 = 6,
+	RA6W_CIPHER_GCMP_256 = 7,
+	RA6W_CIPHER_CCMP_256 = 8,
+	RA6W_CIPHER_BIP_GMAC_128 = 9,
+	RA6W_CIPHER_BIP_GMAC_256 = 10,
+	RA6W_CIPHER_BIP_CMAC_256 = 11,
+	RA6W_CIPHER_INVALID = 0xFF,
+};
+
+enum ra6w_cfg80211_ps_mode {
+	RA6W_CFG80211_PS_MODE_OFF = 0,
+	RA6W_CFG80211_PS_MODE_ON = 1,
+	RA6W_CFG80211_PS_MODE_ON_DYN = 2
+};
+
+struct ra6w_cfg80211_twt_conf_tag {
+	u8 flow_type; /* (0: Announced, 1: Unannounced) */
+	u8 wake_int_exp;
+	bool wake_dur_unit; /* Unit of measurement (0:256us, 1:tu) */
+	u8 min_twt_wake_dur;
+	u16 wake_int_mantissa;
+};
+
+struct ra6w_cfg80211_twt_setup_ind {
+	u8 resp_type;
+	u8 sta_idx;
+	struct ra6w_cfg80211_twt_conf_tag conf;
+};
+
+struct ra6w_cfg80211_beacon_info {
+	u8 *head;
+	u8 *tail;
+	u8 *ies;
+	u16 head_len;
+	u16 tail_len;
+	u16 ies_len;
+	u16 tim_len;
+	u16 len;
+	u8 dtim_period;
+};
+
+struct ra6w_cfg80211_csa_info {
+	struct ra6w_cfg80211_vif *vif;
+	struct ra6w_cfg80211_beacon_info bcn;
+	u8 buf[512];
+	struct cfg80211_chan_def chandef;
+	int count;
+	u8 status;
+	u8 ch_idx;
+	struct work_struct work;
+};
+
+struct ra6w_cfg80211_remain_on_channel {
+	struct ra6w_cfg80211_vif *vif;
+	struct ieee80211_channel *chan;
+	unsigned int duration;
+	bool internal;
+	bool on_chan;
+	s32 tx_cnt;
+	u64 tx_cookie[RA6W_CFG80211_ROC_TX];
+};
+
+struct ra6w_cfg80211_key {
+	u8 key_index;
+	u8 key[RA6W_CFG80211_KEY_LEN_MAX];
+	u8 key_len;
+	u8 seq[RA6W_CFG80211_KEY_SEQ_LEN_MAX];
+	u8 seq_len;
+	u32 cipher;
+	u8 cipher_type;
+	u8 sta_idx;
+	u8 vif_idx;
+	bool pairwise;
+};
+
+struct ra6w_cfg80211_sta_stats {
+	unsigned long last_acttive_time;
+	struct ra6w_rx_ext_hdr last_rx_data_ext;
+	struct ra6w_rx_ext_hdr last_stats;
+	u32 rx_packets;
+	u32 tx_packets;
+	u32 tx_failed;
+	u64 rx_bytes;
+	u64 tx_bytes;
+};
+
+struct ra6w_cfg80211_chan_info {
+	struct cfg80211_chan_def chan_def;
+	u8 count;
+};
+
+struct ra6w_cfg80211_survey_info {
+	u32 filled;
+	u32 chan_dwell_ms;
+	u32 chan_busy_ms;
+	s8 chan_noise_dbm;
+};
+
+struct ra6w_cfg80211_sta {
+	struct list_head list;
+	bool valid;
+	u8 mac_addr[ETH_ALEN];
+	u16 aid;
+	u8 sta_idx;
+	u8 vif_idx;
+	enum nl80211_band band;
+	enum nl80211_chan_width width;
+	u16 center_freq;
+	u32 center_freq1;
+	u32 center_freq2;
+	u8 ch_idx;
+	bool qos;
+	struct ra6w_cfg80211_key key;
+	bool ht;
+	bool vht;
+	bool he;
+	struct ra6w_cfg80211_sta_stats stats;
+	int listen_interval;
+	struct ra6w_cfg80211_twt_setup_ind twt_ind;
+};
+
+struct ra6w_cfg80211_vif {
+	struct list_head list;
+	u8 vif_idx;
+	u8 addr_idx;
+	enum nl80211_iftype type;
+	struct wireless_dev wdev;
+	struct net_device *ndev;
+	void *priv;
+	bool roc_tdls;
+	u8 tdls_status;
+	bool tdls_chsw_prohibited;
+	struct ra6w_cfg80211_key keys[RA6W_CFG80211_KEYS_MAX];
+	u8 ch_idx;
+	bool up;
+	bool use_4addr;
+	s32 generation;
+	struct ra6w_stats stats;
+	union {
+		struct {
+			u32 flags;
+			struct ra6w_cfg80211_sta *ap;
+			struct ra6w_cfg80211_sta *tdls_sta;
+		} sta;
+		struct {
+			u8 ap_isolate;
+			struct list_head sta_list;
+			struct ra6w_cfg80211_beacon_info bcn;
+			u8 bcmc_index;
+			struct ra6w_cfg80211_csa_info *csa;
+		} ap;
+	};
+};
+
+struct ra6w_cfg80211_priv {
+	struct ra6w_core *core;
+	struct wiphy *wiphy;
+	struct dentry *root;
+	u8 ext_capa[RA6W_CFG80211_EXT_CAPA_MAX];
+	struct list_head vifs;
+	struct ra6w_cmd_phy_cfg phy_config;
+	struct ra6w_cfg80211_sta sta_table[RA6W_CFG80211_STA_TABLE_MAX];
+	struct ra6w_cfg80211_vif *vif_table[RA6W_CFG80211_VIF_MAX];
+	DECLARE_BITMAP(vif_map, RA6W_CFG80211_VIF_MAX);
+	struct mac_address addresses[RA6W_CFG80211_VIF_MAX];
+	DECLARE_BITMAP(addr_map, RA6W_CFG80211_VIF_MAX);
+	s32 vif_started;
+	s8 mon_vif_idx;
+	struct ra6w_cfg80211_chan_info chaninfo_table[RA6W_CFG80211_CHANINFO_MAX];
+	u8 chaninfo_index;
+	struct ra6w_cfg80211_remain_on_channel *roc;
+	struct cfg80211_scan_request *scan_request;
+	struct ra6w_cfg80211_survey_info survey_table[RA6W_CMD_SCAN_CHANNEL_MAX];
+};
+
+int ra6w_cfg80211_init(struct ra6w_core *core, struct device *dev);
+void ra6w_cfg80211_deinit(struct ra6w_core *core);
+void ra6w_cfg80211_chaninfo_set(struct ra6w_cfg80211_vif *vif, u8 ch_idx,
+				const struct cfg80211_chan_def *chandef);
+struct ra6w_cfg80211_chan_info *ra6w_cfg80211_chaninfo_get(struct ra6w_cfg80211_vif *vif);
+void ra6w_cfg80211_chaninfo_unset(struct ra6w_cfg80211_vif *vif);
+u8 *ra6w_cfg80211_create_beacon(struct ra6w_cfg80211_beacon_info *bcn,
+				struct cfg80211_beacon_data *new);
+struct ra6w_cfg80211_sta *ra6w_cfg80211_sta_get(struct ra6w_cfg80211_priv *priv, u8 sta_idx);
+void ra6w_cfg80211_sta_free(struct ra6w_cfg80211_vif *vif, u8 sta_idx);
+struct ra6w_cfg80211_vif *ra6w_cfg80211_vif_get(struct ra6w_cfg80211_priv *priv, u8 vif_idx);
+void ra6w_cfg80211_scan_done(struct ra6w_cfg80211_priv *priv);
+
+#endif /* RA6W_CFG80211_H */
