Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

author: John W. Linville <linville@tuxdriver.com> 2012-06-26 14:27:34 -0400
committer: John W. Linville <linville@tuxdriver.com> 2012-06-26 14:27:34 -0400
commit: 2c443443e715fc79da9b7c3e4f31a71fcf315b09 (patch)
tree: 5b73cea04b13c888d94e29000c0a66ed2c23980f /include
parent: 5ea276963eacbef742fe4854883c0f69c903fcfd (diff)
parent: 371a255e863857f988a91a3850d6feeaa4f3c536 (diff)
4 files changed, 15 insertions, 24 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 6e0601189db9..318fc1f705b1 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1633,6 +1633,8 @@ enum ieee80211_sa_query_action {
 #define WLAN_OUI_TYPE_WFA_P2P           9
 #define WLAN_OUI_MICROSOFT              0x0050f2
 #define WLAN_OUI_TYPE_MICROSOFT_WPA     1
+#define WLAN_OUI_TYPE_MICROSOFT_WMM     2
+#define WLAN_OUI_TYPE_MICROSOFT_WPS     4
 /*
 * WMM/802.11e Tspec Element
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index b7c3b737ddde..c0fc5d277338 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1542,6 +1542,9 @@ enum nl80211_attrs {
 #define NL80211_MIN_REMAIN_ON_CHANNEL_TIME      10
+/* default RSSI threshold for scan results if none specified. */
+#define NL80211_SCAN_RSSI_THOLD_OFF             -300
 /**
 * enum nl80211_iftype - (virtual) interface types
 *
@@ -1974,6 +1977,8 @@ enum nl80211_reg_rule_attr {
 * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
 * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
 * only report BSS with matching SSID.
+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
+ *      BSS in scan results. Filtering is turned off if not specified.
 * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
 *      attribute number currently defined
 * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
@@ -1982,6 +1987,7 @@ enum nl80211_sched_scan_match_attr {
        __NL80211_SCHED_SCAN_MATCH_ATTR_INVALID,
        NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
+        NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
        /* keep last */
        __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f0163a10b8ce..061c01957e54 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1027,6 +1027,7 @@ struct cfg80211_match_set {
 * @wiphy: the wiphy this was for
 * @dev: the interface
 * @channels: channels to scan
+ * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
 */
 struct cfg80211_sched_scan_request {
        struct cfg80211_ssid *ssids;
@@ -1037,6 +1038,7 @@ struct cfg80211_sched_scan_request {
        size_t ie_len;
        struct cfg80211_match_set *match_sets;
        int n_match_sets;
+        s32 rssi_thold;
        /* internal */
        struct wiphy *wiphy;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 6914f9978aea..670a58ba8a41 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2254,6 +2254,9 @@ enum ieee80211_rate_control_changed {
 * @get_et_strings:  Ethtool API to get a set of strings to describe stats
 *      and perhaps other supported types of ethtool data-sets.
 *
+ * @get_rssi: Get current signal strength in dBm, the function is optional
+ *      and can sleep.
+ *
 */
 struct ieee80211_ops {
        void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -2393,6 +2396,8 @@ struct ieee80211_ops {
        void    (*get_et_strings)(struct ieee80211_hw *hw,
                                  struct ieee80211_vif *vif,
                                  u32 sset, u8 *data);
+        int     (*get_rssi)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                            struct ieee80211_sta *sta, s8 *rssi_dbm);
 };
 /**
@@ -3843,28 +3848,4 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif,
 */
 int ieee80211_ave_rssi(struct ieee80211_vif *vif);
-/* Extra debugging macros */
-#ifdef CONFIG_MAC80211_HT_DEBUG
-#define ht_vdbg(fmt, ...)                       \
-        pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define ht_vdbg(fmt, ...)                       \
-do {                                            \
-        if (0)                                  \
-                pr_debug(fmt, ##__VA_ARGS__);   \
-} while (0)
-#endif
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-#define ibss_vdbg(fmt, ...)                     \
-        pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define ibss_vdbg(fmt, ...)                     \
-do {                                            \
-        if (0)                                  \
-                pr_debug(fmt, ##__VA_ARGS__);   \
-} while (0)
-#endif
 #endif /* MAC80211_H */
author	John W. Linville <linville@tuxdriver.com>	2012-06-26 14:27:34 -0400
committer	John W. Linville <linville@tuxdriver.com>	2012-06-26 14:27:34 -0400
commit	2c443443e715fc79da9b7c3e4f31a71fcf315b09 (patch)
tree	5b73cea04b13c888d94e29000c0a66ed2c23980f /include
parent	5ea276963eacbef742fe4854883c0f69c903fcfd (diff)
parent	371a255e863857f988a91a3850d6feeaa4f3c536 (diff)