]> git.baikalelectronics.ru Git - kernel.git/commitdiff
cfg80211: Notify previous user request during self managed wiphy registration
authorSriram R <srirrama@codeaurora.org>
Tue, 16 Apr 2019 05:46:33 +0000 (11:16 +0530)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 23 Apr 2019 11:45:30 +0000 (13:45 +0200)
Commit 3188efd808a9("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: 3188efd808a9 ("cfg80211: Notify all User Hints To self managed wiphys")
Signed-off-by: Sriram R <srirrama@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/reg.c

index 0ba778f371cb25fe6b610dc6e112beed2db55e9b..a6fd5ce199da197aeaffc6b71b75703fe811974b 100644 (file)
@@ -3778,10 +3778,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
                /*
                 * The last request may have been received before this
                 * registration call. Call the driver notifier if
-                * initiator is USER and user type is CELL_BASE.
+                * initiator is USER.
                 */
-               if (lr->initiator == NL80211_REGDOM_SET_BY_USER &&
-                   lr->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE)
+               if (lr->initiator == NL80211_REGDOM_SET_BY_USER)
                        reg_call_notifier(wiphy, lr);
        }