From b22da3d8526a935aa31e086e63f60ff3246cb61c Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 09 Dec 2023 07:24:11 +0000
Subject: [PATCH] add stmac read mac form eeprom
---
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h
old mode 100644
new mode 100755
index b33ba02..815e9c4
--- a/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h
+++ b/kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h
@@ -187,10 +187,9 @@
CONN_STATE_4WAY_M2 = 19,
CONN_STATE_4WAY_M3 = 20,
CONN_STATE_4WAY_M4 = 21,
- CONN_STATE_ADD_KEY = 22,
- CONN_STATE_CONNECTED = 23,
- CONN_STATE_GROUPKEY_M1 = 24,
- CONN_STATE_GROUPKEY_M2 = 25,
+ CONN_STATE_CONNECTED = 22,
+ CONN_STATE_GROUPKEY_M1 = 23,
+ CONN_STATE_GROUPKEY_M2 = 24,
};
enum enq_pkt_type {
@@ -219,7 +218,6 @@
#endif
wl_chip_nv_path_list_ctrl_t nv_by_chip;
country_list_t *country_head;
- int ioctl_ver;
int band;
int bw_cap[2];
wl_country_t cspec;
@@ -299,8 +297,6 @@
int d2h_intr_method;
int d2h_intr_control;
int enq_hdr_pkt;
- int aspm;
- int l1ss;
#endif
int dpc_cpucore;
int rxf_cpucore;
@@ -349,9 +345,6 @@
uint war;
#ifdef WL_EXT_WOWL
uint wowl;
-#ifdef BCMDBUS
- uint wowl_dngldown;
-#endif
#endif
#ifdef GET_CUSTOM_MAC_FROM_CONFIG
char hw_ether[62];
@@ -407,20 +400,17 @@
int dhd_conf_get_otp(dhd_pub_t *dhd, si_t *sih);
bool dhd_conf_legacy_msi_chip(dhd_pub_t *dhd);
#endif
-#ifdef WL_CFG80211
-bool dhd_conf_legacy_chip_check(dhd_pub_t *dhd);
-bool dhd_conf_new_chip_check(dhd_pub_t *dhd);
-bool dhd_conf_extsae_chip(dhd_pub_t *dhd);
-#endif
void dhd_conf_set_path_params(dhd_pub_t *dhd, char *fw_path, char *nv_path);
int dhd_conf_set_intiovar(dhd_pub_t *dhd, int ifidx, uint cmd, char *name,
int val, int def, bool down);
int dhd_conf_get_band(dhd_pub_t *dhd);
-int dhd_conf_country(dhd_pub_t *dhd, char *cmd, char *buf);
+int dhd_conf_set_country(dhd_pub_t *dhd, wl_country_t *cspec);
int dhd_conf_get_country(dhd_pub_t *dhd, wl_country_t *cspec);
+int dhd_conf_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
#ifdef CCODE_LIST
int dhd_ccode_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
#endif
+int dhd_conf_fix_country(dhd_pub_t *dhd);
bool dhd_conf_match_channel(dhd_pub_t *dhd, uint32 channel);
void dhd_conf_set_wme(dhd_pub_t *dhd, int ifidx, int mode);
void dhd_conf_set_mchan_bw(dhd_pub_t *dhd, int go, int source);
@@ -432,7 +422,6 @@
uint dhd_conf_get_chip(void *context);
uint dhd_conf_get_chiprev(void *context);
int dhd_conf_get_pm(dhd_pub_t *dhd);
-int dhd_conf_reg2args(dhd_pub_t *dhd, char *cmd, bool set, uint32 index, uint32 *val);
int dhd_conf_check_hostsleep(dhd_pub_t *dhd, int cmd, void *buf, int len,
int *hostsleep_set, int *hostsleep_val, int *ret);
void dhd_conf_get_hostsleep(dhd_pub_t *dhd,
@@ -451,9 +440,6 @@
uint dhd_conf_get_insuspend(dhd_pub_t *dhd, uint mask);
int dhd_conf_set_suspend_resume(dhd_pub_t *dhd, int suspend);
void dhd_conf_postinit_ioctls(dhd_pub_t *dhd);
-#ifdef WL_STATIC_IF
-void dhd_conf_preinit_ioctls_sta(dhd_pub_t *dhd, int ifidx);
-#endif /* WL_STATIC_IF */
int dhd_conf_preinit(dhd_pub_t *dhd);
int dhd_conf_reset(dhd_pub_t *dhd);
int dhd_conf_attach(dhd_pub_t *dhd);
@@ -463,10 +449,7 @@
int dhd_conf_suspend_resume_sta(dhd_pub_t *dhd, int ifidx, int suspend);
/* Add to adjust 802.1x priority */
extern void pktset8021xprio(void *pkt, int prio);
-#if defined(BCMSDIO) || defined(BCMPCIE) || defined(BCMDBUS)
+#ifdef BCMSDIO
extern int dhd_bus_sleep(dhd_pub_t *dhdp, bool sleep, uint32 *intstatus);
-#endif
-#ifdef WL_EXT_WOWL
-int dhd_conf_wowl_dngldown(dhd_pub_t *dhd);
#endif
#endif /* _dhd_config_ */
--
Gitblit v1.6.2