d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As I thought, this is a bad idea. When forming aggregates, the RTS/CTS

Browse Source 
stuff and rate control lookup is only done on the first frame.
This commit is contained in:
Adrian Chadd 2012-04-07 05:46:00 +00:00
parent afbcb86218
commit 781e7eaffd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/ath/if_ath_tx_ht.c
View File

@ -741,18 +741,14 @@ ath_tx_form_aggr(struct ath_softc *sc, struct ath_node *an, struct ath_tid *tid,
/*
* If the current frame has an RTS/CTS configuration
* that differs from the first frame, don't include
* this in the aggregate. It's possible that the
* "right" thing to do here is enforce the aggregate
* configuration.
* that differs from the first frame, override the
* subsequent frame with this config.
*/
if ((bf_first->bf_state.bfs_txflags &
(HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) !=
(bf->bf_state.bfs_txflags &
(HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA))) {
status = ATH_AGGR_NONAGGR;
break;
}
bf->bf_state.bfs_txflags &=
(HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA);
bf->bf_state.bfs_txflags |=
bf_first->bf_state.bfs_txflags &
(HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA);
/*
* TODO: If it's _before_ the BAW left edge, complain very