Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f8a1c774570ab50f1657083c990b968d5f7f22cb

Authored by Luis R. Rodriguez
Committed by Johannes Berg
1 parent bfead0808c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

cfg80211: make regulatory_update() static 

Now that we have wiphy_regulatory_register() we can
tuck away the core's regulatory_update() call there
and make it static.

Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -543,7 +543,6 @@
543 543  
544 544 /* set up regulatory info */
545 545 wiphy_regulatory_register(wiphy);
546   - regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
547 546  
548 547 list_add_rcu(&rdev->list, &cfg80211_rdev_list);
549 548 cfg80211_rdev_list_generation++;
... ... @@ -1232,8 +1232,8 @@
1232 1232 wiphy->reg_notifier(wiphy, last_request);
1233 1233 }
1234 1234  
1235   -void regulatory_update(struct wiphy *wiphy,
1236   - enum nl80211_reg_initiator setby)
  1235 +static void regulatory_update(struct wiphy *wiphy,
  1236 + enum nl80211_reg_initiator setby)
1237 1237 {
1238 1238 mutex_lock(&reg_mutex);
1239 1239 wiphy_update_regulatory(wiphy, setby);
... ... @@ -2388,6 +2388,8 @@
2388 2388 reg_num_devs_support_basehint++;
2389 2389  
2390 2390 mutex_unlock(&reg_mutex);
  2391 +
  2392 + regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
2391 2393 }
2392 2394  
2393 2395 /* Caller must hold cfg80211_mutex */
... ... @@ -34,7 +34,6 @@
34 34  
35 35 int set_regdom(const struct ieee80211_regdomain *rd);
36 36  
37   -void regulatory_update(struct wiphy *wiphy, enum nl80211_reg_initiator setby);
38 37 bool reg_last_request_cell_base(void);
39 38  
40 39 /**