forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h
old mode 100644new mode 100755
....@@ -187,10 +187,9 @@
187187 CONN_STATE_4WAY_M2 = 19,
188188 CONN_STATE_4WAY_M3 = 20,
189189 CONN_STATE_4WAY_M4 = 21,
190
- CONN_STATE_ADD_KEY = 22,
191
- CONN_STATE_CONNECTED = 23,
192
- CONN_STATE_GROUPKEY_M1 = 24,
193
- CONN_STATE_GROUPKEY_M2 = 25,
190
+ CONN_STATE_CONNECTED = 22,
191
+ CONN_STATE_GROUPKEY_M1 = 23,
192
+ CONN_STATE_GROUPKEY_M2 = 24,
194193 };
195194
196195 enum enq_pkt_type {
....@@ -219,7 +218,6 @@
219218 #endif
220219 wl_chip_nv_path_list_ctrl_t nv_by_chip;
221220 country_list_t *country_head;
222
- int ioctl_ver;
223221 int band;
224222 int bw_cap[2];
225223 wl_country_t cspec;
....@@ -402,20 +400,17 @@
402400 int dhd_conf_get_otp(dhd_pub_t *dhd, si_t *sih);
403401 bool dhd_conf_legacy_msi_chip(dhd_pub_t *dhd);
404402 #endif
405
-#ifdef WL_CFG80211
406
-bool dhd_conf_legacy_chip_check(dhd_pub_t *dhd);
407
-bool dhd_conf_new_chip_check(dhd_pub_t *dhd);
408
-bool dhd_conf_extsae_chip(dhd_pub_t *dhd);
409
-#endif
410403 void dhd_conf_set_path_params(dhd_pub_t *dhd, char *fw_path, char *nv_path);
411404 int dhd_conf_set_intiovar(dhd_pub_t *dhd, int ifidx, uint cmd, char *name,
412405 int val, int def, bool down);
413406 int dhd_conf_get_band(dhd_pub_t *dhd);
414
-int dhd_conf_country(dhd_pub_t *dhd, char *cmd, char *buf);
407
+int dhd_conf_set_country(dhd_pub_t *dhd, wl_country_t *cspec);
415408 int dhd_conf_get_country(dhd_pub_t *dhd, wl_country_t *cspec);
409
+int dhd_conf_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
416410 #ifdef CCODE_LIST
417411 int dhd_ccode_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
418412 #endif
413
+int dhd_conf_fix_country(dhd_pub_t *dhd);
419414 bool dhd_conf_match_channel(dhd_pub_t *dhd, uint32 channel);
420415 void dhd_conf_set_wme(dhd_pub_t *dhd, int ifidx, int mode);
421416 void dhd_conf_set_mchan_bw(dhd_pub_t *dhd, int go, int source);
....@@ -427,7 +422,6 @@
427422 uint dhd_conf_get_chip(void *context);
428423 uint dhd_conf_get_chiprev(void *context);
429424 int dhd_conf_get_pm(dhd_pub_t *dhd);
430
-int dhd_conf_reg2args(dhd_pub_t *dhd, char *cmd, bool set, uint32 index, uint32 *val);
431425 int dhd_conf_check_hostsleep(dhd_pub_t *dhd, int cmd, void *buf, int len,
432426 int *hostsleep_set, int *hostsleep_val, int *ret);
433427 void dhd_conf_get_hostsleep(dhd_pub_t *dhd,
....@@ -446,9 +440,6 @@
446440 uint dhd_conf_get_insuspend(dhd_pub_t *dhd, uint mask);
447441 int dhd_conf_set_suspend_resume(dhd_pub_t *dhd, int suspend);
448442 void dhd_conf_postinit_ioctls(dhd_pub_t *dhd);
449
-#ifdef WL_STATIC_IF
450
-void dhd_conf_preinit_ioctls_sta(dhd_pub_t *dhd, int ifidx);
451
-#endif /* WL_STATIC_IF */
452443 int dhd_conf_preinit(dhd_pub_t *dhd);
453444 int dhd_conf_reset(dhd_pub_t *dhd);
454445 int dhd_conf_attach(dhd_pub_t *dhd);