From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 15 Oct 2015 12:28:56 +0000 (+0200)
Subject: cfg80211: reg: fix reg_ignore_cell_hint return type
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a515de660747eb01f3ef80e75bfc51ac63cfc546;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

cfg80211: reg: fix reg_ignore_cell_hint return type

The return type should be enum reg_request_treatment for both
branches of the #ifdef.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index b870369fb62e..2e8d6f39ed56 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1353,7 +1353,8 @@ static bool reg_dev_ignore_cell_hint(struct wiphy *wiphy)
 	return !(wiphy->features & NL80211_FEATURE_CELL_BASE_REG_HINTS);
 }
 #else
-static int reg_ignore_cell_hint(struct regulatory_request *pending_request)
+static enum reg_request_treatment
+reg_ignore_cell_hint(struct regulatory_request *pending_request)
 {
 	return REG_REQ_IGNORE;
 }