diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-09 11:01:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-09 11:01:37 -0500 |
| commit | a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae (patch) | |
| tree | facc20b09719093ea35cd05374f31b34df95ae15 /net/mac80211/sta_info.h | |
| parent | c9be4a5c49cf51cc70a993f004c5bb30067a65ce (diff) | |
| parent | 5e20a4b53094651d80f856ff55a916b999dbb57a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 1489bca9ea97..37c1889afd3a 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
| @@ -299,7 +299,6 @@ struct sta_info { | |||
| 299 | spinlock_t lock; | 299 | spinlock_t lock; |
| 300 | 300 | ||
| 301 | struct work_struct drv_unblock_wk; | 301 | struct work_struct drv_unblock_wk; |
| 302 | struct work_struct free_sta_wk; | ||
| 303 | 302 | ||
| 304 | u16 listen_interval; | 303 | u16 listen_interval; |
| 305 | 304 | ||
| @@ -563,4 +562,6 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta); | |||
| 563 | void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta); | 562 | void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta); |
| 564 | void ieee80211_sta_ps_deliver_uapsd(struct sta_info *sta); | 563 | void ieee80211_sta_ps_deliver_uapsd(struct sta_info *sta); |
| 565 | 564 | ||
| 565 | void ieee80211_cleanup_sdata_stas(struct ieee80211_sub_if_data *sdata); | ||
| 566 | |||
| 566 | #endif /* STA_INFO_H */ | 567 | #endif /* STA_INFO_H */ |