Deleted Added
full compact
if_ath_tx_ht.c (249578) if_ath_tx_ht.c (250665)
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 249578 2013-04-17 07:21:30Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath_tx_ht.c 250665 2013-05-15 18:33:05Z 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>

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

857 /*
858 * Chain the buffers together
859 */
860 if (bf_prev)
861 bf_prev->bf_next = bf;
862 bf_prev = bf;
863
864 /*
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>

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

857 /*
858 * Chain the buffers together
859 */
860 if (bf_prev)
861 bf_prev->bf_next = bf;
862 bf_prev = bf;
863
864 /*
865 * XXX TODO: if any sub-frames have RTS/CTS enabled;
866 * enable it for the entire aggregate.
865 * If we're leaking frames, just return at this point;
866 * we've queued a single frame and we don't want to add
867 * any more.
867 */
868 */
869 if (tid->an->an_leak_count) {
870 status = ATH_AGGR_LEAK_CLOSED;
871 break;
872 }
868
869#if 0
870 /*
871 * terminate aggregation on a small packet boundary
872 */
873 if (bf->bf_state.bfs_pktlen < ATH_AGGR_MINPLEN) {
874 status = ATH_AGGR_SHORTPKT;
875 break;

--- 16 unchanged lines hidden ---
873
874#if 0
875 /*
876 * terminate aggregation on a small packet boundary
877 */
878 if (bf->bf_state.bfs_pktlen < ATH_AGGR_MINPLEN) {
879 status = ATH_AGGR_SHORTPKT;
880 break;

--- 16 unchanged lines hidden ---