Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[firefly-linux-kernel-4.4.55.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 2a33d8bc886b3abf1a843a7492b21f0b19d622cd..5aeebb9085f8f5298872213bd4a31716be1cfbdc 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -72,17 +72,6 @@ struct cfg80211_registered_device {
        /* current channel */
        struct ieee80211_channel *channel;
 
-#ifdef CONFIG_CFG80211_DEBUGFS
-       /* Debugfs entries */
-       struct wiphy_debugfsdentries {
-               struct dentry *rts_threshold;
-               struct dentry *fragmentation_threshold;
-               struct dentry *short_retry_limit;
-               struct dentry *long_retry_limit;
-               struct dentry *ht40allow_map;
-       } debugfs;
-#endif
-
        /* must be last because of the way we do wiphy_priv(),
         * and it should at least be aligned to NETDEV_ALIGN */
        struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
@@ -358,6 +347,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                              struct wireless_dev *wdev);
 
 void cfg80211_conn_work(struct work_struct *work);
+void cfg80211_sme_failed_assoc(struct wireless_dev *wdev);
 bool cfg80211_sme_failed_reassoc(struct wireless_dev *wdev);
 
 /* internal helpers */