old mode 100644new mode 100755.. | .. |
---|
187 | 187 | CONN_STATE_4WAY_M2 = 19, |
---|
188 | 188 | CONN_STATE_4WAY_M3 = 20, |
---|
189 | 189 | 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, |
---|
194 | 193 | }; |
---|
195 | 194 | |
---|
196 | 195 | enum enq_pkt_type { |
---|
.. | .. |
---|
219 | 218 | #endif |
---|
220 | 219 | wl_chip_nv_path_list_ctrl_t nv_by_chip; |
---|
221 | 220 | country_list_t *country_head; |
---|
222 | | - int ioctl_ver; |
---|
223 | 221 | int band; |
---|
224 | 222 | int bw_cap[2]; |
---|
225 | 223 | wl_country_t cspec; |
---|
.. | .. |
---|
299 | 297 | int d2h_intr_method; |
---|
300 | 298 | int d2h_intr_control; |
---|
301 | 299 | int enq_hdr_pkt; |
---|
302 | | - int aspm; |
---|
303 | | - int l1ss; |
---|
304 | 300 | #endif |
---|
305 | 301 | int dpc_cpucore; |
---|
306 | 302 | int rxf_cpucore; |
---|
.. | .. |
---|
349 | 345 | uint war; |
---|
350 | 346 | #ifdef WL_EXT_WOWL |
---|
351 | 347 | uint wowl; |
---|
352 | | -#ifdef BCMDBUS |
---|
353 | | - uint wowl_dngldown; |
---|
354 | | -#endif |
---|
355 | 348 | #endif |
---|
356 | 349 | #ifdef GET_CUSTOM_MAC_FROM_CONFIG |
---|
357 | 350 | char hw_ether[62]; |
---|
.. | .. |
---|
407 | 400 | int dhd_conf_get_otp(dhd_pub_t *dhd, si_t *sih); |
---|
408 | 401 | bool dhd_conf_legacy_msi_chip(dhd_pub_t *dhd); |
---|
409 | 402 | #endif |
---|
410 | | -#ifdef WL_CFG80211 |
---|
411 | | -bool dhd_conf_legacy_chip_check(dhd_pub_t *dhd); |
---|
412 | | -bool dhd_conf_new_chip_check(dhd_pub_t *dhd); |
---|
413 | | -bool dhd_conf_extsae_chip(dhd_pub_t *dhd); |
---|
414 | | -#endif |
---|
415 | 403 | void dhd_conf_set_path_params(dhd_pub_t *dhd, char *fw_path, char *nv_path); |
---|
416 | 404 | int dhd_conf_set_intiovar(dhd_pub_t *dhd, int ifidx, uint cmd, char *name, |
---|
417 | 405 | int val, int def, bool down); |
---|
418 | 406 | int dhd_conf_get_band(dhd_pub_t *dhd); |
---|
419 | | -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); |
---|
420 | 408 | 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); |
---|
421 | 410 | #ifdef CCODE_LIST |
---|
422 | 411 | int dhd_ccode_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec); |
---|
423 | 412 | #endif |
---|
| 413 | +int dhd_conf_fix_country(dhd_pub_t *dhd); |
---|
424 | 414 | bool dhd_conf_match_channel(dhd_pub_t *dhd, uint32 channel); |
---|
425 | 415 | void dhd_conf_set_wme(dhd_pub_t *dhd, int ifidx, int mode); |
---|
426 | 416 | void dhd_conf_set_mchan_bw(dhd_pub_t *dhd, int go, int source); |
---|
.. | .. |
---|
432 | 422 | uint dhd_conf_get_chip(void *context); |
---|
433 | 423 | uint dhd_conf_get_chiprev(void *context); |
---|
434 | 424 | int dhd_conf_get_pm(dhd_pub_t *dhd); |
---|
435 | | -int dhd_conf_reg2args(dhd_pub_t *dhd, char *cmd, bool set, uint32 index, uint32 *val); |
---|
436 | 425 | int dhd_conf_check_hostsleep(dhd_pub_t *dhd, int cmd, void *buf, int len, |
---|
437 | 426 | int *hostsleep_set, int *hostsleep_val, int *ret); |
---|
438 | 427 | void dhd_conf_get_hostsleep(dhd_pub_t *dhd, |
---|
.. | .. |
---|
451 | 440 | uint dhd_conf_get_insuspend(dhd_pub_t *dhd, uint mask); |
---|
452 | 441 | int dhd_conf_set_suspend_resume(dhd_pub_t *dhd, int suspend); |
---|
453 | 442 | void dhd_conf_postinit_ioctls(dhd_pub_t *dhd); |
---|
454 | | -#ifdef WL_STATIC_IF |
---|
455 | | -void dhd_conf_preinit_ioctls_sta(dhd_pub_t *dhd, int ifidx); |
---|
456 | | -#endif /* WL_STATIC_IF */ |
---|
457 | 443 | int dhd_conf_preinit(dhd_pub_t *dhd); |
---|
458 | 444 | int dhd_conf_reset(dhd_pub_t *dhd); |
---|
459 | 445 | int dhd_conf_attach(dhd_pub_t *dhd); |
---|
.. | .. |
---|
463 | 449 | int dhd_conf_suspend_resume_sta(dhd_pub_t *dhd, int ifidx, int suspend); |
---|
464 | 450 | /* Add to adjust 802.1x priority */ |
---|
465 | 451 | extern void pktset8021xprio(void *pkt, int prio); |
---|
466 | | -#if defined(BCMSDIO) || defined(BCMPCIE) || defined(BCMDBUS) |
---|
| 452 | +#ifdef BCMSDIO |
---|
467 | 453 | extern int dhd_bus_sleep(dhd_pub_t *dhdp, bool sleep, uint32 *intstatus); |
---|
468 | | -#endif |
---|
469 | | -#ifdef WL_EXT_WOWL |
---|
470 | | -int dhd_conf_wowl_dngldown(dhd_pub_t *dhd); |
---|
471 | 454 | #endif |
---|
472 | 455 | #endif /* _dhd_config_ */ |
---|