summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohn W. Linville2014-03-20 16:53:20 +0100
committerJohn W. Linville2014-03-20 16:53:20 +0100
commit7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch)
tree6cd273487574edd2da40ce14b1981e14a5171caa /net/mac80211/ieee80211_i.h
parentmwifiex: update MCS set as per RX-STBC bit from hostapd (diff)
parentcfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (diff)
downloadkernel-qcow2-linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.gz
kernel-qcow2-linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz
kernel-qcow2-linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0d1a0f801b94..222c28b75315 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1391,6 +1391,7 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata);
void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata);
void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata,
__le16 fc, bool acked);
+void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata);
void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);
/* IBSS code */