summaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-11-05 09:18:02 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 20:49:46 +0100
commit1daa37c7ba01bd788148d6a9dc5d6fb491a20931 (patch)
tree0f14434859f06496249f6ed8972ff515849a628e /net/wireless/reg.c
parent222ea5819901ed174db4df2e26aa5e982f857845 (diff)
downloadop-kernel-dev-1daa37c7ba01bd788148d6a9dc5d6fb491a20931.zip
op-kernel-dev-1daa37c7ba01bd788148d6a9dc5d6fb491a20931.tar.gz
cfg80211: remove second argument from reg_process_hint()
The iniator is already available to us, so use it. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 04b6fe4..dccdfe3 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1526,8 +1526,7 @@ new_request:
}
/* This processes *all* regulatory hints */
-static void reg_process_hint(struct regulatory_request *reg_request,
- enum nl80211_reg_initiator reg_initiator)
+static void reg_process_hint(struct regulatory_request *reg_request)
{
struct wiphy *wiphy = NULL;
@@ -1537,7 +1536,7 @@ static void reg_process_hint(struct regulatory_request *reg_request,
if (reg_request->wiphy_idx != WIPHY_IDX_INVALID)
wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx);
- if (reg_initiator == NL80211_REGDOM_SET_BY_DRIVER && !wiphy) {
+ if (reg_request->initiator == NL80211_REGDOM_SET_BY_DRIVER && !wiphy) {
kfree(reg_request);
return;
}
@@ -1546,10 +1545,10 @@ static void reg_process_hint(struct regulatory_request *reg_request,
case REG_REQ_ALREADY_SET:
/* This is required so that the orig_* parameters are saved */
if (wiphy && wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
- wiphy_update_regulatory(wiphy, reg_initiator);
+ wiphy_update_regulatory(wiphy, reg_request->initiator);
break;
default:
- if (reg_initiator == NL80211_REGDOM_SET_BY_USER)
+ if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
schedule_delayed_work(&reg_timeout,
msecs_to_jiffies(3142));
break;
@@ -1587,7 +1586,7 @@ static void reg_process_pending_hints(void)
spin_unlock(&reg_requests_lock);
- reg_process_hint(reg_request, reg_request->initiator);
+ reg_process_hint(reg_request);
}
/* Processes beacon hints -- this has nothing to do with country IEs */
OpenPOWER on IntegriCloud