Deleted Added
full compact
ieee80211_ddb.c (196019) ieee80211_ddb.c (234324)
1/*-
2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 10 unchanged lines hidden (view full) ---

19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 10 unchanged lines hidden (view full) ---

19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ddb.c 196019 2009-08-01 19:26:27Z rwatson $");
27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ddb.c 234324 2012-04-15 20:29:39Z adrian $");
28
29#include "opt_ddb.h"
30#include "opt_wlan.h"
31
32#ifdef DDB
33/*
34 * IEEE 802.11 DDB support
35 */

--- 161 unchanged lines hidden (view full) ---

197}
198#endif /* IEEE80211_SUPPORT_MESH */
199
200static void
201_db_show_txampdu(const char *sep, int ix, const struct ieee80211_tx_ampdu *tap)
202{
203 db_printf("%stxampdu[%d]: %p flags %b %s\n",
204 sep, ix, tap, tap->txa_flags, IEEE80211_AGGR_BITS,
28
29#include "opt_ddb.h"
30#include "opt_wlan.h"
31
32#ifdef DDB
33/*
34 * IEEE 802.11 DDB support
35 */

--- 161 unchanged lines hidden (view full) ---

197}
198#endif /* IEEE80211_SUPPORT_MESH */
199
200static void
201_db_show_txampdu(const char *sep, int ix, const struct ieee80211_tx_ampdu *tap)
202{
203 db_printf("%stxampdu[%d]: %p flags %b %s\n",
204 sep, ix, tap, tap->txa_flags, IEEE80211_AGGR_BITS,
205 ieee80211_wme_acnames[tap->txa_ac]);
205 ieee80211_wme_acnames[TID_TO_WME_AC(tap->txa_tid)]);
206 db_printf("%s token %u lastsample %d pkts %d avgpps %d qbytes %d qframes %d\n",
207 sep, tap->txa_token, tap->txa_lastsample, tap->txa_pkts,
208 tap->txa_avgpps, tap->txa_qbytes, tap->txa_qframes);
209 db_printf("%s start %u seqpending %u wnd %u attempts %d nextrequest %d\n",
210 sep, tap->txa_start, tap->txa_seqpending, tap->txa_wnd,
211 tap->txa_attempts, tap->txa_nextrequest);
212 /* XXX timer */
213}

--- 74 unchanged lines hidden (view full) ---

288
289 db_printf("\thtcap %b htparam 0x%x htctlchan %u ht2ndchan %u\n",
290 ni->ni_htcap, IEEE80211_HTCAP_BITS,
291 ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan);
292 db_printf("\thtopmode 0x%x htstbc 0x%x chw %u\n",
293 ni->ni_htopmode, ni->ni_htstbc, ni->ni_chw);
294
295 /* XXX ampdu state */
206 db_printf("%s token %u lastsample %d pkts %d avgpps %d qbytes %d qframes %d\n",
207 sep, tap->txa_token, tap->txa_lastsample, tap->txa_pkts,
208 tap->txa_avgpps, tap->txa_qbytes, tap->txa_qframes);
209 db_printf("%s start %u seqpending %u wnd %u attempts %d nextrequest %d\n",
210 sep, tap->txa_start, tap->txa_seqpending, tap->txa_wnd,
211 tap->txa_attempts, tap->txa_nextrequest);
212 /* XXX timer */
213}

--- 74 unchanged lines hidden (view full) ---

288
289 db_printf("\thtcap %b htparam 0x%x htctlchan %u ht2ndchan %u\n",
290 ni->ni_htcap, IEEE80211_HTCAP_BITS,
291 ni->ni_htparam, ni->ni_htctlchan, ni->ni_ht2ndchan);
292 db_printf("\thtopmode 0x%x htstbc 0x%x chw %u\n",
293 ni->ni_htopmode, ni->ni_htstbc, ni->ni_chw);
294
295 /* XXX ampdu state */
296 for (i = 0; i < WME_NUM_AC; i++)
296 for (i = 0; i < WME_NUM_TID; i++)
297 if (ni->ni_tx_ampdu[i].txa_flags & IEEE80211_AGGR_SETUP)
298 _db_show_txampdu("\t", i, &ni->ni_tx_ampdu[i]);
299 for (i = 0; i < WME_NUM_TID; i++)
300 if (ni->ni_rx_ampdu[i].rxa_flags)
301 _db_show_rxampdu("\t", i, &ni->ni_rx_ampdu[i]);
302
303 db_printf("\tinact %u inact_reload %u txrate %u\n",
304 ni->ni_inact, ni->ni_inact_reload, ni->ni_txrate);

--- 575 unchanged lines hidden ---
297 if (ni->ni_tx_ampdu[i].txa_flags & IEEE80211_AGGR_SETUP)
298 _db_show_txampdu("\t", i, &ni->ni_tx_ampdu[i]);
299 for (i = 0; i < WME_NUM_TID; i++)
300 if (ni->ni_rx_ampdu[i].rxa_flags)
301 _db_show_rxampdu("\t", i, &ni->ni_rx_ampdu[i]);
302
303 db_printf("\tinact %u inact_reload %u txrate %u\n",
304 ni->ni_inact, ni->ni_inact_reload, ni->ni_txrate);

--- 575 unchanged lines hidden ---