diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-05-27 08:41:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-03 14:10:45 -0400 |
commit | 6a8579d0e62c0eac428184ce45e86bc46677724a (patch) | |
tree | 192d3adc84985598ad6006df43d246adce002f7e /net/mac80211/driver-trace.h | |
parent | 2b2c009ecf71f4c66ff8420b63dddbc9737e04e3 (diff) |
mac80211: clean up ieee80211_stop_tx_ba_session
There's no sense in letting anything but internal
mac80211 functions set the initiator to anything
but WLAN_BACK_INITIATOR, since WLAN_BACK_RECIPIENT
is only valid when we have received a frame from
the peer, which we react to directly in mac80211.
The debugfs code I recently added got this wrong
as well.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-trace.h')
-rw-r--r-- | net/mac80211/driver-trace.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index 577460da2ea1..6b90630151ab 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h | |||
@@ -876,25 +876,23 @@ TRACE_EVENT(api_start_tx_ba_cb, | |||
876 | ); | 876 | ); |
877 | 877 | ||
878 | TRACE_EVENT(api_stop_tx_ba_session, | 878 | TRACE_EVENT(api_stop_tx_ba_session, |
879 | TP_PROTO(struct ieee80211_sta *sta, u16 tid, u16 initiator), | 879 | TP_PROTO(struct ieee80211_sta *sta, u16 tid), |
880 | 880 | ||
881 | TP_ARGS(sta, tid, initiator), | 881 | TP_ARGS(sta, tid), |
882 | 882 | ||
883 | TP_STRUCT__entry( | 883 | TP_STRUCT__entry( |
884 | STA_ENTRY | 884 | STA_ENTRY |
885 | __field(u16, tid) | 885 | __field(u16, tid) |
886 | __field(u16, initiator) | ||
887 | ), | 886 | ), |
888 | 887 | ||
889 | TP_fast_assign( | 888 | TP_fast_assign( |
890 | STA_ASSIGN; | 889 | STA_ASSIGN; |
891 | __entry->tid = tid; | 890 | __entry->tid = tid; |
892 | __entry->initiator = initiator; | ||
893 | ), | 891 | ), |
894 | 892 | ||
895 | TP_printk( | 893 | TP_printk( |
896 | STA_PR_FMT " tid:%d initiator:%d", | 894 | STA_PR_FMT " tid:%d", |
897 | STA_PR_ARG, __entry->tid, __entry->initiator | 895 | STA_PR_ARG, __entry->tid |
898 | ) | 896 | ) |
899 | ); | 897 | ); |
900 | 898 | ||