Skip to content

Commit

Permalink
rtl8192ee: Fix lockup on start
Browse files Browse the repository at this point in the history
Kernel commit 51d62f2f2c50 ("cfg80211: Save the regulatory domain with a lock")
caused a lock dependency to the cfg80211 version of this driver. It is fixed by
moving the regulatory domain initialization call so that it is outside the lock
in the probe routine.

See lwfinger/rtl8188eu#386 for further discussion.
Signed-off-by: Larry Finger <[email protected]>
  • Loading branch information
lwfinger committed Jan 15, 2022
1 parent 74278ad commit ba4037b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions os_dep/linux/ioctl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -6955,9 +6955,6 @@ void rtw_cfg80211_init_wiphy(_adapter *padapter)
rtw_cfg80211_init_ht_capab(padapter, &bands->ht_cap, NL80211_BAND_5GHZ, rf_type);
}
#endif
/* init regulary domain */
rtw_regd_init(padapter);

/* copy mac_addr to wiphy */
_rtw_memcpy(wiphy->perm_addr, adapter_mac_addr(padapter), ETH_ALEN);

Expand Down Expand Up @@ -7513,6 +7510,9 @@ int rtw_wdev_alloc(_adapter *padapter, struct wiphy *wiphy)
ATOMIC_SET(&pwdev_priv->switch_ch_to, 1);
#endif

/* init regulary domain */
rtw_regd_init(padapter);

exit:
return ret;
}
Expand Down

0 comments on commit ba4037b

Please sign in to comment.