Commit 7ba0fa7f authored by Jakub Kicinski's avatar Jakub Kicinski

Merge tag 'wireless-2022-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Kalle Valo says:

====================
wireless fixes for v6.0

First set of fixes for v6.0. Small one this time, fix a cfg80211
warning seen with brcmfmac and remove an unncessary inline keyword
from wilc1000.

* tag 'wireless-2022-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: wilc1000: fix spurious inline in wilc_handle_disconnect()
  wifi: cfg80211: Fix validating BSS pointers in __cfg80211_connect_result
====================

Link: https://lore.kernel.org/r/20220809164756.B1DAEC433D6@smtp.kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b8c3bf0e f01272ee
...@@ -635,7 +635,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif, ...@@ -635,7 +635,7 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
conn_info->req_ies_len = 0; conn_info->req_ies_len = 0;
} }
inline void wilc_handle_disconnect(struct wilc_vif *vif) void wilc_handle_disconnect(struct wilc_vif *vif)
{ {
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
......
...@@ -215,5 +215,6 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length); ...@@ -215,5 +215,6 @@ void wilc_gnrl_async_info_received(struct wilc *wilc, u8 *buffer, u32 length);
void *wilc_parse_join_bss_param(struct cfg80211_bss *bss, void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
struct cfg80211_crypto_settings *crypto); struct cfg80211_crypto_settings *crypto);
int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index); int wilc_set_default_mgmt_key_index(struct wilc_vif *vif, u8 index);
inline void wilc_handle_disconnect(struct wilc_vif *vif); void wilc_handle_disconnect(struct wilc_vif *vif);
#endif #endif
...@@ -782,9 +782,11 @@ void __cfg80211_connect_result(struct net_device *dev, ...@@ -782,9 +782,11 @@ void __cfg80211_connect_result(struct net_device *dev,
#endif #endif
if (cr->status == WLAN_STATUS_SUCCESS) { if (cr->status == WLAN_STATUS_SUCCESS) {
for_each_valid_link(cr, link) { if (!wiphy_to_rdev(wdev->wiphy)->ops->connect) {
if (WARN_ON_ONCE(!cr->links[link].bss)) for_each_valid_link(cr, link) {
break; if (WARN_ON_ONCE(!cr->links[link].bss))
break;
}
} }
for_each_valid_link(cr, link) { for_each_valid_link(cr, link) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment