Merge remote-tracking branch 'net-next/master' into mac80211-next

[linux.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index a4d547f99f8de9b0f46d6e83c0813222f89d07ce..08d2e948c9ad306a0ed40531efc4103877b9f4ae 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -141,6 +141,18 @@ struct cfg80211_internal_bss {
        unsigned long refcount;
        atomic_t hold;
 
+       /* time at the start of the reception of the first octet of the
+        * timestamp field of the last beacon/probe received for this BSS.
+        * The time is the TSF of the BSS specified by %parent_bssid.
+        */
+       u64 parent_tsf;
+
+       /* the BSS according to which %parent_tsf is set. This is set to
+        * the BSS that the interface that requested the scan was connected to
+        * when the beacon/probe was received.
+        */
+       u8 parent_bssid[ETH_ALEN] __aligned(2);
+
        /* must be last because of priv member */
        struct cfg80211_bss pub;
 };
@@ -237,9 +249,9 @@ struct cfg80211_event {
 };
 
 struct cfg80211_cached_keys {
-       struct key_params params[6];
-       u8 data[6][WLAN_MAX_KEY_LEN];
-       int def, defmgmt;
+       struct key_params params[CFG80211_MAX_WEP_KEYS];
+       u8 data[CFG80211_MAX_WEP_KEYS][WLAN_KEY_LEN_WEP104];
+       int def;
 };
 
 enum cfg80211_chan_mode {
@@ -476,6 +488,9 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
 void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
                              struct wireless_dev *wdev);
 
+void cfg80211_stop_nan(struct cfg80211_registered_device *rdev,
+                      struct wireless_dev *wdev);
+
 #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
 
 #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS