Skip to content

Commit 8772eed

Browse files
Sriram Rjmberg-intel
authored andcommitted
cfg80211: Notify previous user request during self managed wiphy registration
Commit c82c06c("cfg80211: Notify all User Hints To self managed wiphys") notified all new user hints to self managed wiphy's after device registration. But it didn't do this for anything other than cell base hints done before registration. This needs to be done during wiphy registration of a self managed device also, so that the previous user settings are retained. Fixes: c82c06c ("cfg80211: Notify all User Hints To self managed wiphys") Signed-off-by: Sriram R <[email protected]> Signed-off-by: Johannes Berg <[email protected]>
1 parent f1267cf commit 8772eed

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

net/wireless/reg.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3778,10 +3778,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
37783778
/*
37793779
* The last request may have been received before this
37803780
* registration call. Call the driver notifier if
3781-
* initiator is USER and user type is CELL_BASE.
3781+
* initiator is USER.
37823782
*/
3783-
if (lr->initiator == NL80211_REGDOM_SET_BY_USER &&
3784-
lr->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE)
3783+
if (lr->initiator == NL80211_REGDOM_SET_BY_USER)
37853784
reg_call_notifier(wiphy, lr);
37863785
}
37873786

0 commit comments

Comments
 (0)