diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-09 17:01:37 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-09 17:01:37 +0100 |
| commit | a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae (patch) | |
| tree | facc20b09719093ea35cd05374f31b34df95ae15 /net/mac80211/sta_info.h | |
| parent | net: prevent setting ttl=0 via IP_TTL (diff) | |
| parent | b43: Fix firmware loading when driver is built into the kernel (diff) | |
| download | linux-a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae.tar.xz linux-a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae.zip | |
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 { spinlock_t lock; struct work_struct drv_unblock_wk; - struct work_struct free_sta_wk; u16 listen_interval; @@ -563,4 +562,6 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta); void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta); void ieee80211_sta_ps_deliver_uapsd(struct sta_info *sta); +void ieee80211_cleanup_sdata_stas(struct ieee80211_sub_if_data *sdata); + #endif /* STA_INFO_H */ |