cfg80211: reg: fix reg_ignore_cell_hint return type

jmberg-intel · jmberg-intel · commit a515de660747 · 2015-10-16T09:15:45.000+02:00
The return type should be enum reg_request_treatment for both
branches of the #ifdef.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,8 @@ static bool reg_dev_ignore_cell_hint(struct wiphy *wiphy)`
`1353`	`1353`	`return !(wiphy->features & NL80211_FEATURE_CELL_BASE_REG_HINTS);`
`1354`	`1354`	`}`
`1355`	`1355`	`#else`
`1356`		`-static int reg_ignore_cell_hint(struct regulatory_request *pending_request)`
	`1356`	`+static enum reg_request_treatment`
	`1357`	`+reg_ignore_cell_hint(struct regulatory_request *pending_request)`
`1357`	`1358`	`{`
`1358`	`1359`	`return REG_REQ_IGNORE;`
`1359`	`1360`	`}`