diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 19:47:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 19:47:16 -0500 |
| commit | 29e553631b2a0d4eebd23db630572e1027a9967a (patch) | |
| tree | a891e02cc245ac9c14dc47528120e262d0298698 /net/mac80211/ieee80211_i.h | |
| parent | ed9fd93e9a0c327e5d02313ba6e233c8e76da118 (diff) | |
| parent | 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 (diff) | |
Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
* 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
mac80211: fix spurious delBA handling
mac80211: fix two remote exploits
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a910bf1f092f..10d316e455de 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -1091,6 +1091,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, | |||
| 1091 | 1091 | ||
| 1092 | int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, | 1092 | int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, |
| 1093 | enum ieee80211_back_parties initiator); | 1093 | enum ieee80211_back_parties initiator); |
| 1094 | int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, | ||
| 1095 | enum ieee80211_back_parties initiator); | ||
| 1094 | 1096 | ||
| 1095 | /* Spectrum management */ | 1097 | /* Spectrum management */ |
| 1096 | void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, | 1098 | void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, |