diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-24 18:01:30 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-24 18:01:30 -0400 |
| commit | dde7dc759b777f385fc5df2af691c82eb455c7f3 (patch) | |
| tree | 5e8f1fcd10a6b264d60bc8a0503656c0611de222 /net/mac80211/ieee80211_i.h | |
| parent | b422c6cd7e93bb613030f14d7d8a0cc73f115629 (diff) | |
| parent | 4c8a9d4bfaf7dbc7d2168494904d79d22cc01db7 (diff) | |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
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); | |||
| 1267 | void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata); | 1267 | void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata); |
| 1268 | void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata, | 1268 | void ieee80211_mgd_conn_tx_status(struct ieee80211_sub_if_data *sdata, |
| 1269 | __le16 fc, bool acked); | 1269 | __le16 fc, bool acked); |
| 1270 | void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata); | ||
| 1270 | 1271 | ||
| 1271 | /* IBSS code */ | 1272 | /* IBSS code */ |
| 1272 | void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local); | 1273 | void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local); |