Skip to content

drivers: wifi: nxp: fix build failure after disabling 802.11ax #80186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashif merged 1 commit into from
Nov 16, 2024
Merged

drivers: wifi: nxp: fix build failure after disabling 802.11ax #80186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions drivers/wifi/nxp/nxp_wifi_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,20 +276,20 @@
case WLAN_REASON_UAP_CLIENT_CONN:
wlan_get_current_uap_network(&nxp_wlan_network);
#ifdef CONFIG_NXP_WIFI_11AX
if (nxp_wlan_network.dot11ax) {
ap_sta_info.link_mode = WIFI_6;
}
if (nxp_wlan_network.dot11ax) {
ap_sta_info.link_mode = WIFI_6;
} else
#endif
#ifdef CONFIG_NXP_WIFI_11AC
else if (nxp_wlan_network.dot11ac) {
if (nxp_wlan_network.dot11ac) {
ap_sta_info.link_mode = WIFI_5;
}
} else
#endif
else if (nxp_wlan_network.dot11n) {
if (nxp_wlan_network.dot11n) {
ap_sta_info.link_mode = WIFI_4;
} else {
ap_sta_info.link_mode = WIFI_3;
}
} else {
ap_sta_info.link_mode = WIFI_3;
}

memcpy(ap_sta_info.mac, data, WIFI_MAC_ADDR_LEN);
ap_sta_info.mac_length = WIFI_MAC_ADDR_LEN;
Expand Down Expand Up @@ -968,16 +968,16 @@
#ifdef CONFIG_NXP_WIFI_11AX
if (nxp_wlan_network.dot11ax) {
status->link_mode = WIFI_6;
}
} else
#endif
#ifdef CONFIG_NXP_WIFI_11AC
else if (nxp_wlan_network.dot11ac) {
status->link_mode = WIFI_5;
}
if (nxp_wlan_network.dot11ac) {
status->link_mode = WIFI_5;
} else
#endif
else if (nxp_wlan_network.dot11n) {
status->link_mode = WIFI_4;
if (nxp_wlan_network.dot11n) {
status->link_mode = WIFI_4;
} else {

Check notice on line 980 in drivers/wifi/nxp/nxp_wifi_drv.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/wifi/nxp/nxp_wifi_drv.c:980 
-					status->link_mode = WIFI_5;
+				status->link_mode = WIFI_5;
 			} else
 #endif
 				if (nxp_wlan_network.dot11n) {
-					status->link_mode = WIFI_4;
+				status->link_mode = WIFI_4;
status->link_mode = WIFI_3;
}

Expand Down Expand Up @@ -1335,6 +1335,7 @@
return 0;
}

#ifdef CONFIG_NXP_WIFI_11AX_TWT
static int nxp_wifi_set_twt(const struct device *dev, struct wifi_twt_params *params)
{
wlan_twt_setup_config_t twt_setup_conf;
Expand Down Expand Up @@ -1367,6 +1368,7 @@

return ret;
}
#endif

static void nxp_wifi_sta_init(struct net_if *iface)
{
Expand Down Expand Up @@ -1654,7 +1656,9 @@
.cfg_11k = nxp_wifi_11k_cfg,
.set_power_save = nxp_wifi_power_save,
.get_power_save_config = nxp_wifi_get_power_save,
#ifdef CONFIG_NXP_WIFI_11AX_TWT
.set_twt = nxp_wifi_set_twt,
#endif
};

#if defined(CONFIG_WIFI_NM_WPA_SUPPLICANT)
Expand Down
Loading