diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /net/mac80211/ieee80211_i.h | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
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 ab2894211638..039affa7c871 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -995,6 +995,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, | |||
| 995 | 995 | ||
| 996 | int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, | 996 | int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, |
| 997 | enum ieee80211_back_parties initiator); | 997 | enum ieee80211_back_parties initiator); |
| 998 | int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, | ||
| 999 | enum ieee80211_back_parties initiator); | ||
| 998 | 1000 | ||
| 999 | /* Spectrum management */ | 1001 | /* Spectrum management */ |
| 1000 | void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, | 1002 | void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata, |