Skip to content

Commit a42c5b2

Browse files
McuxCIBotkaranNXP
authored andcommitted
Pull request #44: Add files for release/2.16.100_minor_rfp_gh_review from CI Generation
Merge in MCUCORE/mcux-sdk-wifi-nxp from release/2.16.100_minor_rfp_gh_review to release/2.16.100_minor_rfp_gh
1 parent 01d8d0a commit a42c5b2

38 files changed

+511
-370
lines changed

incl/port/net/wm_net.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
/*
2+
* Copyright 2008-2024 NXP
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
16
/*
27
* Copyright (c) 2016 Intel Corporation.
3-
* Copyright 2008-2024 NXP
48
*
59
* SPDX-License-Identifier: Apache-2.0
610
*/

incl/wifi_config_default.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
#if defined(RW610) || defined(SD8978) || defined(SD8987) || defined(SD8801) || defined(SD9177)
2222

23+
#if !defined CONFIG_WIFI_AUTO_POWER_SAVE
24+
#define CONFIG_WIFI_AUTO_POWER_SAVE 1
25+
#endif
26+
2327
#if !defined CONFIG_WIFI_MAX_PRIO
2428
#define CONFIG_WIFI_MAX_PRIO (configMAX_PRIORITIES - 1)
2529
#endif

incl/wifidriver/wifi-decl.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,15 +1201,6 @@ typedef PACK_START struct
12011201
t_u8 data[WLAN_BTWT_REPORT_LEN * WLAN_BTWT_REPORT_MAX_NUM];
12021202
} PACK_END wifi_twt_report_t;
12031203

1204-
typedef PACK_START struct
1205-
{
1206-
/** TWT Flow Identifier. Range: [0-7] */
1207-
t_u8 flow_identifier;
1208-
/** TWT operation suspend duration in milli seconds. */
1209-
t_u32 suspend_duration;
1210-
/** TWT information state from FW. */
1211-
t_u8 information_state;
1212-
} PACK_END wifi_twt_information_t;
12131204
#endif /* CONFIG_11AX_TWT */
12141205
#endif
12151206

incl/wifidriver/wifi.h

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
#endif
3030
#endif
3131

32-
#ifndef __ZEPHYR__
33-
#if !CONFIG_WIFI_AUTO_POWER_SAVE
34-
#define CONFIG_WIFI_AUTO_POWER_SAVE 1
35-
#endif
36-
#endif
37-
38-
3932
#define CONFIG_GTK_REKEY_OFFLOAD 0
4033

4134

@@ -1174,6 +1167,12 @@ typedef PACK_START struct
11741167
t_u32 bigtk_micErrCnt;
11751168
/** BIGTK MME not included count*/
11761169
t_u32 bigtk_mmeNotFoundCnt;
1170+
/** RX unicast count */
1171+
t_u32 rx_unicast_cnt;
1172+
/** TX Buffer Overrun Dropped Count */
1173+
t_u32 tx_overrun_cnt;
1174+
/** RX Buffer Overrun Dropped Count */
1175+
t_u32 rx_overrun_cnt;
11771176
} PACK_END wifi_pkt_stats_t;
11781177

11791178
int wifi_get_log(wifi_pkt_stats_t *stats, mlan_bss_type bss_type);
@@ -1184,6 +1183,8 @@ int wifi_set_packet_filters(wifi_flt_cfg_t *flt_cfg);
11841183
int wifi_uap_stop();
11851184
#if CONFIG_WPA_SUPP_AP
11861185
int wifi_uap_do_acs(const int *freq_list);
1186+
#else
1187+
int wifi_uap_do_acs(const int *freq_list, const t_u16 acs_band);
11871188
#endif
11881189

11891190
#if CONFIG_WIFI_CAPA
@@ -1391,13 +1392,6 @@ int wifi_set_twt_teardown_cfg(const wifi_twt_teardown_config_t *teardown_config)
13911392
*/
13921393
int wifi_get_twt_report(wifi_twt_report_t *twt_report);
13931394

1394-
/** Twt information
1395-
*
1396-
* \param[out] twt_report TWT Information
1397-
*
1398-
* \return WM_SUCCESS if successful otherwise failure.
1399-
*/
1400-
int wifi_twt_information(wifi_twt_information_t *information);
14011395
#endif /* CONFIG_11AX_TWT */
14021396
#endif
14031397

incl/wifidriver/wifi_events.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
#include <osa.h>
1616

17+
#if CONFIG_WPA_SUPP
18+
#define CONFIG_WPA_SUPP_AP 1
19+
#endif
20+
1721
/** Wi-Fi events */
1822
enum wifi_event
1923
{
@@ -48,6 +52,9 @@ enum wifi_event
4852
/** Association Notify */
4953
WIFI_EVENT_ASSOCIATION_NOTIFY,
5054
#endif
55+
#if CONFIG_WPA_SUPP_AP
56+
WIFI_EVENT_ACS_COMPLETE,
57+
#endif
5158
#endif
5259
/** PMK */
5360
WIFI_EVENT_PMK,

incl/wlcmgr/wlan.h

Lines changed: 70 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <wifi_events.h>
2323
#include <wifi.h>
2424

25-
#define WLAN_DRV_VERSION "v1.3.r48.p21"
25+
#define WLAN_DRV_VERSION "v1.3.r48.p25"
2626

2727
#if CONFIG_WPA2_ENTP
2828
#include <wm_mbedtls_helper_api.h>
@@ -1474,10 +1474,6 @@ typedef wifi_btwt_config_t wlan_btwt_config_t;
14741474
* \ref wifi_twt_report_t
14751475
*/
14761476
typedef wifi_twt_report_t wlan_twt_report_t;
1477-
/** Configuration for TWT information
1478-
* \ref wifi_twt_information_t
1479-
*/
1480-
typedef wifi_twt_information_t wlan_twt_information_t;
14811477
#endif /* CONFIG_11AX_TWT */
14821478
#if CONFIG_MMSF
14831479
#define WLAN_AMPDU_DENSITY 0x30
@@ -3365,14 +3361,6 @@ int wlan_set_multicast(t_u8 mef_action);
33653361
*/
33663362
int wlan_set_ieeeps_cfg(struct wlan_ieeeps_config *ps_cfg);
33673363

3368-
/** Set configuration parameters of IEEE power save mode.
3369-
*
3370-
* \param [in] ps_cfg Power save configuratiuon includes multiple parameters.
3371-
* \return WM_SUCCESS if the call was successful.
3372-
* \return -WM_FAIL if failed.
3373-
*/
3374-
int wlan_set_ieeeps_cfg(struct wlan_ieeeps_config *ps_cfg);
3375-
33763364
/** Configure listen interval of IEEE power save mode.
33773365
*
33783366
* \note <b>Delivery traffic indication message (DTIM)</b>:
@@ -5373,11 +5361,11 @@ void wlan_register_fw_dump_cb(void (*wlan_usb_init_cb)(void),
53735361
/** Set crypto RC4 (rivest cipher 4) algorithm encrypt command param.
53745362
*
53755363
* \param[in] Key key
5376-
* \param[in] KeyLength The maximum key length is 32.
5364+
* \param[in] KeyLength The KeyLength + KeyIVLength valid range [1,256].
53775365
* \param[in] KeyIV KeyIV
5378-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5366+
* \param[in] KeyIVLength The KeyLength + KeyIVLength valid range [1,256].
53795367
* \param[in] Data Data
5380-
* \param[in] DataLength The maximum data length is 1300.
5368+
* \param[in] DataLength The maximum data length is 1200.
53815369
*
53825370
* \return WM_SUCCESS if successful.
53835371
* \return -WM_E_PERM if not supported.
@@ -5393,11 +5381,12 @@ int wlan_set_crypto_RC4_encrypt(
53935381
/** Set crypto RC4 (rivest cipher 4) algorithm decrypt command param.
53945382
*
53955383
* \param[in] Key key
5396-
* \param[in] KeyLength The maximum key length is 32.
5384+
* \param[in] KeyLength The KeyLength + KeyIVLength valid range [1,256].
53975385
* \param[in] KeyIV KeyIV
5398-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5386+
* \param[in] KeyIVLength The KeyLength + KeyIVLength valid range [1,256].
53995387
* \param[in] Data Data
5400-
* \param[in] DataLength The maximum data length is 1300.
5388+
* \param[in] DataLength The maximum data length is 1200.
5389+
*
54015390
* \return WM_SUCCESS if successful.
54025391
* \return -WM_E_PERM if not supported.
54035392
* \return -WM_FAIL if failure.
@@ -5412,11 +5401,11 @@ int wlan_set_crypto_RC4_decrypt(
54125401
/** Set crypto AES_ECB (advanced encryption standard, electronic codebook) algorithm encrypt command param.
54135402
*
54145403
* \param[in] Key key
5415-
* \param[in] KeyLength The maximum key length is 32.
5416-
* \param[in] KeyIV KeyIV
5417-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5404+
* \param[in] KeyLength The key length is 16/24/32.
5405+
* \param[in] KeyIV KeyIV should point to a 8 bytes array with any value in the array.
5406+
* \param[in] KeyIVLength The keyIV length is 8.
54185407
* \param[in] Data Data
5419-
* \param[in] DataLength The maximum data length is 1300.
5408+
* \param[in] DataLength The data length is 16.
54205409
* \return WM_SUCCESS if successful.
54215410
* \return -WM_E_PERM if not supported.
54225411
* \return -WM_FAIL if failure.
@@ -5431,11 +5420,11 @@ int wlan_set_crypto_AES_ECB_encrypt(
54315420
/** Set crypto AES_ECB (advanced encryption standard, electronic codebook) algorithm decrypt command param.
54325421
*
54335422
* \param[in] Key key
5434-
* \param[in] KeyLength The maximum key length is 32.
5435-
* \param[in] KeyIV KeyIV
5436-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5423+
* \param[in] KeyLength The key length is 16/24/32.
5424+
* \param[in] KeyIV KeyIV should point to a 8 bytes array with any value in the array.
5425+
* \param[in] KeyIVLength The keyIV length is 8.
54375426
* \param[in] Data Data
5438-
* \param[in] DataLength The maximum data length is 1300.
5427+
* \param[in] DataLength The data length is 16.
54395428
* \return WM_SUCCESS if successful.
54405429
* \return -WM_E_PERM if not supported.
54415430
* \return -WM_FAIL if failure.
@@ -5450,11 +5439,11 @@ int wlan_set_crypto_AES_ECB_decrypt(
54505439
/** Set crypto AES_WRAP (advanced encryption standard wrap) algorithm encrypt command param.
54515440
*
54525441
* \param[in] Key key
5453-
* \param[in] KeyLength The maximum key length is 32.
5442+
* \param[in] KeyLength The key length is 16/24/32.
54545443
* \param[in] KeyIV KeyIV
5455-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5444+
* \param[in] KeyIVLength The keyIV length is 8.
54565445
* \param[in] Data Data
5457-
* \param[in] DataLength The maximum data length is 1300.
5446+
* \param[in] DataLength The data length valid range [8,1016].
54585447
* \return WM_SUCCESS if successful.
54595448
* \return -WM_E_PERM if not supported.
54605449
* \return -WM_FAIL if failure.
@@ -5469,11 +5458,11 @@ int wlan_set_crypto_AES_WRAP_encrypt(
54695458
/** Set crypto AES_WRAP algorithm decrypt command param.
54705459
*
54715460
* \param[in] Key key
5472-
* \param[in] KeyLength The maximum key length is 32.
5461+
* \param[in] KeyLength The key length is 16/24/32.
54735462
* \param[in] KeyIV KeyIV
5474-
* \param[in] KeyIVLength The maximum keyIV length is 32.
5463+
* \param[in] KeyIVLength The keyIV length is 8.
54755464
* \param[in] Data Data
5476-
* \param[in] DataLength The maximum data length is 1300.
5465+
* \param[in] DataLength The data length valid range [8,1016].
54775466
* \return WM_SUCCESS if successful.
54785467
* \return -WM_E_PERM if not supported.
54795468
* \return -WM_FAIL if failure.
@@ -5489,13 +5478,13 @@ int wlan_set_crypto_AES_WRAP_decrypt(
54895478
* algorithm encrypt command param.
54905479
*
54915480
* \param[in] Key key
5492-
* \param[in] KeyLength The maximum key length is 32.
5481+
* \param[in] KeyLength The key length is 16/32.
54935482
* \param[in] AAD AAD
5494-
* \param[in] AADLength The maximum AAD length is 32.
5483+
* \param[in] AADLength The maximum AAD length is 30.
54955484
* \param[in] Nonce Nonce
5496-
* \param[in] NonceLength The maximum nonce length is 14.
5485+
* \param[in] NonceLength The nonce length valid range [7,13].
54975486
* \param[in] Data Data
5498-
* \param[in] DataLength The maximum data length is 1300.
5487+
* \param[in] DataLength The maximum data length is 80.
54995488
* \return WM_SUCCESS if successful.
55005489
* \return -WM_E_PERM if not supported.
55015490
* \return -WM_FAIL if failure.
@@ -5516,13 +5505,13 @@ int wlan_set_crypto_AES_CCMP_encrypt(const t_u8 *Key,
55165505
/** Set crypto AES_CCMP algorithm decrypt command param.
55175506
*
55185507
* \param[in] Key key
5519-
* \param[in] KeyLength The maximum key length is 32.
5508+
* \param[in] KeyLength The key length is 16/32.
55205509
* \param[in] AAD AAD
5521-
* \param[in] AADLength The maximum AAD length is 32.
5510+
* \param[in] AADLength The maximum AAD length is 30.
55225511
* \param[in] Nonce Nonce
5523-
* \param[in] NonceLength The maximum nonce length is 14.
5512+
* \param[in] NonceLength The nonce length valid range [7,13].
55245513
* \param[in] Data Data
5525-
* \param[in] DataLength The maximum data length is 1300.
5514+
* \param[in] DataLength The maximum data length is 80.
55265515
* \return WM_SUCCESS if successful.
55275516
* \return -WM_E_PERM if not supported.
55285517
* \return -WM_FAIL if failure.
@@ -5543,13 +5532,13 @@ int wlan_set_crypto_AES_CCMP_decrypt(const t_u8 *Key,
55435532
/** Set crypto AES_GCMP (galois/counter mode with AES-GMAC) algorithm encrypt command param.
55445533
*
55455534
* \param[in] Key key
5546-
* \param[in] KeyLength The maximum key length is 32.
5535+
* \param[in] KeyLength The key length is 16/32.
55475536
* \param[in] AAD AAD
5548-
* \param[in] AADLength The maximum AAD length is 32.
5537+
* \param[in] AADLength The maximum AAD length is 30.
55495538
* \param[in] Nonce Nonce
5550-
* \param[in] NonceLength The maximum nonce length is 14.
5539+
* \param[in] NonceLength The nonce length valid range [7,13].
55515540
* \param[in] Data Data
5552-
* \param[in] DataLength The maximum data length is 1300.
5541+
* \param[in] DataLength The maximum data length is 80.
55535542
* \return WM_SUCCESS if successful.
55545543
* \return -WM_E_PERM if not supported.
55555544
* \return -WM_FAIL if failure.
@@ -5570,13 +5559,13 @@ int wlan_set_crypto_AES_GCMP_encrypt(const t_u8 *Key,
55705559
/** Set crypto AES_CCMP algorithm decrypt command param.
55715560
*
55725561
* \param[in] Key key
5573-
* \param[in] KeyLength The maximum key length is 32.
5562+
* \param[in] KeyLength The key length is 16/32.
55745563
* \param[in] AAD AAD
5575-
* \param[in] AADLength The maximum AAD length is 32.
5564+
* \param[in] AADLength The maximum AAD length is 30.
55765565
* \param[in] Nonce Nonce
5577-
* \param[in] NonceLength The maximum nonce length is 14.
5566+
* \param[in] NonceLength The nonce length valid range [7,13].
55785567
* \param[in] Data Data
5579-
* \param[in] DataLength The maximum data length is 1300.
5568+
* \param[in] DataLength The maximum data length is 80.
55805569
* \return WM_SUCCESS if successful.
55815570
* \return -WM_E_PERM if not supported.
55825571
* \return -WM_FAIL if failure.
@@ -5816,13 +5805,6 @@ uint8_t *wlan_get_twt_teardown_cfg(void);
58165805
*/
58175806
int wlan_get_twt_report(wlan_twt_report_t *twt_report);
58185807

5819-
/** TWT information
5820-
*
5821-
* \param[out] twt_information TWT information.
5822-
*
5823-
* \return WM_SUCCESS if successful otherwise return -WM_FAIL.
5824-
*/
5825-
int wlan_twt_information(wlan_twt_information_t *twt_information);
58265808
#endif /* CONFIG_11AX_TWT */
58275809

58285810
#if CONFIG_MMSF
@@ -6669,10 +6651,23 @@ int wlan_set_ips(int option);
66696651
*/
66706652
int wlan_get_signal_info(wlan_rssi_info_t *signal);
66716653

6654+
/**
6655+
* Set band configuration.
6656+
* \param[in] bandcfg band configureation
6657+
*
6658+
* \return WM_SUCCESS if successful otherwise return -WM_FAIL.
6659+
*/
66726660
int wlan_set_bandcfg(wlan_bandcfg_t *bandcfg);
6661+
6662+
/**
6663+
* Get band configuration.
6664+
* \param[out] bandcfg band configureation
6665+
*
6666+
* \return WM_SUCCESS if successful otherwise return -WM_FAIL.
6667+
*/
66736668
int wlan_get_bandcfg(wlan_bandcfg_t *bandcfg);
66746669

6675-
#if (CONFIG_COMPRESS_TX_PWTBL)
6670+
#if CONFIG_COMPRESS_TX_PWTBL
66766671
/**
66776672
* set region power table
66786673
* \param[in] region_code region code
@@ -6681,6 +6676,15 @@ int wlan_get_bandcfg(wlan_bandcfg_t *bandcfg);
66816676
int wlan_set_rg_power_cfg(t_u16 region_code);
66826677
#endif
66836678

6679+
#if (CONFIG_COMPRESS_RU_TX_PWTBL) && (CONFIG_11AX)
6680+
/**
6681+
* set ru tx power table
6682+
* \param[in] region_code region code
6683+
* \return WM_SUCCESS if successful otherwise failure.
6684+
*/
6685+
int wlan_set_ru_power_cfg(t_u16 region_code);
6686+
#endif
6687+
66846688
#if CONFIG_TURBO_MODE
66856689
/**
66866690
* Get Turbo mode.
@@ -7094,6 +7098,15 @@ int wlan_set_network_ip_byname(char *name, struct wlan_ip_config *ip);
70947098
int wlan_sta_inactivityto(wlan_inactivity_to_t *inac_to, t_u16 action);
70957099
#endif
70967100

7101+
/**
7102+
* Get 802.11 Status Code.
7103+
*
7104+
* \param[in] reason wlcmgr event reason
7105+
*
7106+
* \return status code defined in IEEE 802.11-2020 standard.
7107+
*/
7108+
t_u16 wlan_get_status_code(enum wlan_event_reason reason);
7109+
70977110
#ifdef RW610
70987111
/**
70997112
* Get board temperature.

0 commit comments

Comments
 (0)