Merge branch 'upstream/ticketlock-cleanup' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index c14865172da70d0fd04918f503d0714042ec5e64..220f3bd176f89cc33192b72ddcc11f296cba54fd 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -582,7 +582,7 @@ int wiphy_register(struct wiphy *wiphy)
        }
 
        /* set up regulatory info */
-       wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
+       regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
 
        list_add_rcu(&rdev->list, &cfg80211_rdev_list);
        cfg80211_rdev_list_generation++;