aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-25 00:01:30 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-05-25 00:01:30 +0200
commitdde7dc759b777f385fc5df2af691c82eb455c7f3 (patch)
tree5e8f1fcd10a6b264d60bc8a0503656c0611de222 /net/mac80211/ieee80211_i.h
parent{cfg,mac}80211: move mandatory rates calculation to cfg80211 (diff)
parentmac80211: close AP_VLAN interfaces before unregistering all (diff)
downloadlinux-dev-dde7dc759b777f385fc5df2af691c82eb455c7f3.tar.xz
linux-dev-dde7dc759b777f385fc5df2af691c82eb455c7f3.zip
Merge remote-tracking branch 'mac80211/master' into 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 b7cbd4ebf0e0..ba3cd284d104 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1267,6 +1267,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_sta_restart(struct ieee80211_sub_if_data *sdata);
/* IBSS code */
void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local);