summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-01-13 14:40:59 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-01-13 14:40:59 -0500
commitf13352519ee8c4b22b87fc1a47743d1f53ea193e (patch)
tree48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /include/net
parent559c33d84da71e07816e692bfd73ad92675256a6 (diff)
parent26b0e411d37a2ca5992d02884dc3fa4e1907e598 (diff)
downloadop-kernel-dev-f13352519ee8c4b22b87fc1a47743d1f53ea193e.zip
op-kernel-dev-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.gz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/net')
-rw-r--r--include/net/cfg80211.h8
-rw-r--r--include/net/mac80211.h8
2 files changed, 13 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 56c5977..b1f84b0 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4640,6 +4640,14 @@ void cfg80211_report_wowlan_wakeup(struct wireless_dev *wdev,
*/
void cfg80211_crit_proto_stopped(struct wireless_dev *wdev, gfp_t gfp);
+/**
+ * ieee80211_get_num_supported_channels - get number of channels device has
+ * @wiphy: the wiphy
+ *
+ * Return: the number of channels supported by the device.
+ */
+unsigned int ieee80211_get_num_supported_channels(struct wiphy *wiphy);
+
/* Logging, debugging and troubleshooting/diagnostic helpers. */
/* wiphy_printk helpers, similar to dev_printk */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index f838af8..f4ab2fb 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1616,8 +1616,6 @@ enum ieee80211_hw_flags {
* @extra_beacon_tailroom: tailroom to reserve in each beacon tx skb.
* Can be used by drivers to add extra IEs.
*
- * @channel_change_time: time (in microseconds) it takes to change channels.
- *
* @max_signal: Maximum value for signal (rssi) in RX information, used
* only when @IEEE80211_HW_SIGNAL_UNSPEC or @IEEE80211_HW_SIGNAL_DB
*
@@ -1699,7 +1697,6 @@ struct ieee80211_hw {
u32 flags;
unsigned int extra_tx_headroom;
unsigned int extra_beacon_tailroom;
- int channel_change_time;
int vif_data_size;
int sta_data_size;
int chanctx_data_size;
@@ -2122,6 +2119,11 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
* appropriately (only the last frame may have %IEEE80211_TX_STATUS_EOSP)
* and also take care of the EOSP and MORE_DATA bits in the frame.
* The driver may also use ieee80211_sta_eosp() in this case.
+ *
+ * Note that if the driver ever buffers frames other than QoS-data
+ * frames, it must take care to never send a non-QoS-data frame as
+ * the last frame in a service period, adding a QoS-nulldata frame
+ * after a non-QoS-data frame if needed.
*/
/**
OpenPOWER on IntegriCloud