Deleted Added
full compact
if_ath_tx_ht.c (237171) if_ath_tx_ht.c (238710)
1/*-
2 * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
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

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd.
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

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

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath_tx_ht.c 237171 2012-06-16 21:37:15Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath_tx_ht.c 238710 2012-07-23 03:52:18Z adrian $");
32
33#include "opt_inet.h"
34#include "opt_ath.h"
35#include "opt_wlan.h"
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/sysctl.h>

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

506 series[i].RateFlags |= HAL_RATESERIES_HALFGI;
507
508 if (ni->ni_chw == 20 &&
509 ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20 &&
510 ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20)
511 series[i].RateFlags |= HAL_RATESERIES_HALFGI;
512
513 series[i].Rate = rt->info[rc[i].rix].rateCode;
32
33#include "opt_inet.h"
34#include "opt_ath.h"
35#include "opt_wlan.h"
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/sysctl.h>

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

506 series[i].RateFlags |= HAL_RATESERIES_HALFGI;
507
508 if (ni->ni_chw == 20 &&
509 ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20 &&
510 ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20)
511 series[i].RateFlags |= HAL_RATESERIES_HALFGI;
512
513 series[i].Rate = rt->info[rc[i].rix].rateCode;
514 series[i].RateIndex = rc[i].rix;
515 series[i].tx_power_cap = 0x3f; /* XXX? */
514
515 /*
516 * PktDuration doesn't include slot, ACK, RTS, etc timing -
517 * it's just the packet duration
518 */
519 if (series[i].Rate & IEEE80211_RATE_MCS) {
520 series[i].PktDuration =
521 ath_computedur_ht(pktlen

--- 345 unchanged lines hidden ---
516
517 /*
518 * PktDuration doesn't include slot, ACK, RTS, etc timing -
519 * it's just the packet duration
520 */
521 if (series[i].Rate & IEEE80211_RATE_MCS) {
522 series[i].PktDuration =
523 ath_computedur_ht(pktlen

--- 345 unchanged lines hidden ---