diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-19 03:29:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-19 03:29:34 -0700 |
| commit | 47b2747d7976238853e85601f03d1551aaf01052 (patch) | |
| tree | 3e0e2258cb9aa6566c632d8c4528dcae6c9e7f21 | |
| parent | 9fdb9cd8612206404d4e3b9f03eecf859ecf7fc2 (diff) | |
| parent | f6d05c4ca33126bdb03a38ebcc66511ba1d1a9cb (diff) | |
Merge "Revert "cfg80211: Define new API to send reg change event""
| -rw-r--r-- | include/net/cfg80211.h | 11 | ||||
| -rw-r--r-- | net/wireless/reg.c | 8 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 881c5d46a66c..da9374303051 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -82,9 +82,6 @@ struct wiphy; /* Indicate support for including KEK length in rekey data */ #define CFG80211_REKEY_DATA_KEK_LEN 1 -/* Indicate support for regulatory update sync event */ -#define CFG80211_REG_UPDATE_SYNC_EVENT 1 - /* * wireless hardware capability structures */ @@ -5774,14 +5771,6 @@ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); */ void cfg80211_ap_stopped(struct net_device *netdev, gfp_t gfp); -/** - * cfg80211_send_reg_change_event - notify user-space of regulatory change - * @request: regulatory request - * @wiphy: the wiphy to use - */ -void cfg80211_send_reg_change_event(struct regulatory_request *request, - struct wiphy *wiphy); - /* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */ diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 4ede2c4cff41..26ac0a4808a0 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1794,14 +1794,6 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) reg_check_channels(); } -void cfg80211_send_reg_change_event(struct regulatory_request *request, - struct wiphy *wiphy) -{ - request->wiphy_idx = get_wiphy_idx(wiphy); - nl80211_send_reg_change_event(request); -} -EXPORT_SYMBOL(cfg80211_send_reg_change_event); - static void handle_channel_custom(struct wiphy *wiphy, struct ieee80211_channel *chan, const struct ieee80211_regdomain *regd) |