DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 342AB618CA
From:   Sriram R <srirrama@codeaurora.org>
To:     johannes@sipsolutions.net
Cc:     linux-wireless@vger.kernel.org, Sriram R <srirrama@codeaurora.org>
Subject: [PATCH] cfg80211: Notify previous user request during self managed wiphy registration
Date:   Tue, 16 Apr 2019 11:16:33 +0530
Message-Id: <1555393593-19018-1-git-send-email-srirrama@codeaurora.org>
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

Commit c82c06ce43d3("cfg80211: Notify all User Hints To self managed wiphys") notifies
all new user hints to self managed wiphy's after device registration.
But it doesn't notify user request (other than cell base hints) which was
set before registration.
This needs to be done during wiphy registration of a self managed device also,
so that the previous user settings are retained.

Signed-off-by: Sriram R <srirrama@codeaurora.org>
---
 net/wireless/reg.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2f1bf91..85a0b5e 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -3739,10 +3739,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);
 	}
 
-- 
2.7.4