Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cfg80211: remove second argument from reg_process_hint()

Browse source 
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>
This commit is contained in:
Luis R. Rodriguez 2013-11-05 09:18:02 -08:00 committed by Johannes Berg
parent 222ea58199
commit 1daa37c7ba
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/wireless/reg.c
View file

@ -1526,8 +1526,7 @@ __regulatory_hint(struct wiphy *wiphy,
} }
/* This processes *all* regulatory hints */ /* This processes *all* regulatory hints */
static void reg_process_hint(struct regulatory_request *reg_request, static void reg_process_hint(struct regulatory_request *reg_request)
enum nl80211_reg_initiator reg_initiator)
{ {
struct wiphy *wiphy = NULL; 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) if (reg_request->wiphy_idx != WIPHY_IDX_INVALID)
wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx); 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); kfree(reg_request);
return; return;
} }
@ -1546,10 +1545,10 @@ static void reg_process_hint(struct regulatory_request *reg_request,
case REG_REQ_ALREADY_SET: case REG_REQ_ALREADY_SET:
/* This is required so that the orig_* parameters are saved */ /* This is required so that the orig_* parameters are saved */
if (wiphy && wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) if (wiphy && wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
wiphy_update_regulatory(wiphy, reg_initiator); wiphy_update_regulatory(wiphy, reg_request->initiator);
break; break;
default: default:
if (reg_initiator == NL80211_REGDOM_SET_BY_USER) if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
schedule_delayed_work(&reg_timeout, schedule_delayed_work(&reg_timeout,
msecs_to_jiffies(3142)); msecs_to_jiffies(3142));
break; break;
@ -1587,7 +1586,7 @@ static void reg_process_pending_hints(void)
spin_unlock(&reg_requests_lock); 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 */ /* Processes beacon hints -- this has nothing to do with country IEs */