diff options
author | sam <sam@FreeBSD.org> | 2008-09-21 23:20:04 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-09-21 23:20:04 +0000 |
commit | da7cd2bfa56f0a21358aa5ae6951128a8d88cb40 (patch) | |
tree | 6db5b6806b2211a0f51243a2e4f0ec6f8327dd45 /sys/net80211 | |
parent | 643a17d6c880f3b097ce0e6fd7423c8fefc81c83 (diff) | |
download | FreeBSD-src-da7cd2bfa56f0a21358aa5ae6951128a8d88cb40.zip FreeBSD-src-da7cd2bfa56f0a21358aa5ae6951128a8d88cb40.tar.gz |
change ieee80211_ampdu_stop to take an explicit reason code
Diffstat (limited to 'sys/net80211')
-rw-r--r-- | sys/net80211/ieee80211_ht.c | 12 | ||||
-rw-r--r-- | sys/net80211/ieee80211_ht.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index fbd8546..0a8328b 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1722,7 +1722,8 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, * and the peer notified with a DelBA Action frame. */ void -ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap) +ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap, + int reason) { struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap = ni->ni_vap; @@ -1731,19 +1732,20 @@ ieee80211_ampdu_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap) /* XXX locking */ if (IEEE80211_AMPDU_RUNNING(tap)) { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni, "%s: stop BA stream for AC %d", __func__, tap->txa_ac); + ni, "%s: stop BA stream for AC %d (reason %d)", + __func__, tap->txa_ac, reason); vap->iv_stats.is_ampdu_stop++; ic->ic_addba_stop(ni, tap); args[0] = WME_AC_TO_TID(tap->txa_ac); args[1] = IEEE80211_DELBAPS_INIT; - args[2] = 1; /* XXX reason code */ + args[2] = reason; /* XXX reason code */ ieee80211_send_action(ni, IEEE80211_ACTION_CAT_BA, IEEE80211_ACTION_BA_DELBA, args); } else { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, - ni, "%s: BA stream for AC %d not running", - __func__, tap->txa_ac); + ni, "%s: BA stream for AC %d not running (reason %d)", + __func__, tap->txa_ac, reason); vap->iv_stats.is_ampdu_stop_failed++; } } diff --git a/sys/net80211/ieee80211_ht.h b/sys/net80211/ieee80211_ht.h index beaab18..dfad584 100644 --- a/sys/net80211/ieee80211_ht.h +++ b/sys/net80211/ieee80211_ht.h @@ -183,7 +183,7 @@ void ieee80211_recv_action(struct ieee80211_node *, int ieee80211_ampdu_request(struct ieee80211_node *, struct ieee80211_tx_ampdu *); void ieee80211_ampdu_stop(struct ieee80211_node *, - struct ieee80211_tx_ampdu *); + struct ieee80211_tx_ampdu *, int); int ieee80211_send_bar(struct ieee80211_node *, const struct ieee80211_tx_ampdu *); int ieee80211_send_action(struct ieee80211_node *, |