Skip to content

Commit

Permalink
Fixup for stale kickoff removal in wireless regulator API
Browse files Browse the repository at this point in the history
Cope with the fix in stable 6.3.13 commit bf353116d1bf,
6.5-rc1 commte8c2af660ba0 and and 6.1.39 commit 132b7129c5fe LTS
"wifi: cfg80211: fix regulatory disconnect with OCB/NAN".
That is the removal of REGULATORY_IGNORE_STALE_KICKOFF
from the wireless regulator internal API to fix any driver
that allowed OCB/NAN.
  • Loading branch information
prahal committed Nov 15, 2023
1 parent 888ba1b commit aa3e383
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion os_dep/linux/wifi_regd.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,12 @@ int rtw_regd_init(struct wiphy *wiphy)
wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
#endif

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 39))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) \
&& ((LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 39)) \
|| (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))) \
&& ((LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 13)) \
|| (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))) \
&& (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 4))
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
#endif

Expand Down

0 comments on commit aa3e383

Please sign in to comment.