From 1b861b91c292250b46a58a8559c30603b332cb34 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 21 Jan 2012 11:03:00 -0800 Subject: [PATCH] --- yaml --- r: 289990 b: refs/heads/master c: 15f0ebc23b7c68176ee3f9729d4a7f566cc6c311 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/cfg80211.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9ea0162e62c3..fb06b8a72338 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67e43de6dbc9caf52fa7bcf4c813fd088ba6fbfc +refs/heads/master: 15f0ebc23b7c68176ee3f9729d4a7f566cc6c311 diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index 281899167d2d..5bb3ed4f99f5 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -1143,6 +1143,7 @@ struct cfg80211_disassoc_request { * @bssid: Fixed BSSID requested, maybe be %NULL, if set do not * search for IBSSs with a different BSSID. * @channel: The channel to use if no IBSS can be found to join. + * @channel_type: channel type (HT mode) * @channel_fixed: The channel should be fixed -- do not search for * IBSSs to join on other channels. * @ie: information element(s) to include in the beacon @@ -1981,6 +1982,11 @@ struct wiphy_wowlan_support { * configured as RX antennas. Antenna configuration commands will be * rejected unless this or @available_antennas_tx is set. * + * @probe_resp_offload: + * Bitmap of supported protocols for probe response offloading. + * See &enum nl80211_probe_resp_offload_support_attr. Only valid + * when the wiphy flag @WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD is set. + * * @max_remain_on_channel_duration: Maximum time a remain-on-channel operation * may request, if implemented. *