Deleted Added
full compact
amrr.c (144347) amrr.c (144546)
1/*-
2 * Copyright (c) 2004 INRIA
3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
33 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
35 * THE POSSIBILITY OF SUCH DAMAGES.
36 *
37 */
38
39#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004 INRIA
3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
33 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
35 * THE POSSIBILITY OF SUCH DAMAGES.
36 *
37 */
38
39#include <sys/cdefs.h>
40__FBSDID("$FreeBSD: head/sys/dev/ath/ath_rate/amrr/amrr.c 144347 2005-03-30 20:17:18Z sam $");
40__FBSDID("$FreeBSD: head/sys/dev/ath/ath_rate/amrr/amrr.c 144546 2005-04-02 18:54:30Z sam $");
41
42/*
43 * AMRR rate control. See:
44 * http://www-sop.inria.fr/rapports/sophia/RR-5208.html
45 * "IEEE 802.11 Rate Adaptation: A Practical Approach" by
46 * Mathieu Lacage, Hossein Manshaei, Thierry Turletti
47 */
48#include "opt_inet.h"

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

109
110void
111ath_rate_node_cleanup(struct ath_softc *sc, struct ath_node *an)
112{
113}
114
115void
116ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
41
42/*
43 * AMRR rate control. See:
44 * http://www-sop.inria.fr/rapports/sophia/RR-5208.html
45 * "IEEE 802.11 Rate Adaptation: A Practical Approach" by
46 * Mathieu Lacage, Hossein Manshaei, Thierry Turletti
47 */
48#include "opt_inet.h"

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

109
110void
111ath_rate_node_cleanup(struct ath_softc *sc, struct ath_node *an)
112{
113}
114
115void
116ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
117 HAL_BOOL shortPreamble, size_t frameLen,
117 int shortPreamble, size_t frameLen,
118 u_int8_t *rix, int *try0, u_int8_t *txrate)
119{
120 struct amrr_node *amn = ATH_NODE_AMRR(an);
121
122 *rix = amn->amn_tx_rix0;
123 *try0 = amn->amn_tx_try0;
124 if (shortPreamble)
125 *txrate = amn->amn_tx_rate0sp;
126 else
127 *txrate = amn->amn_tx_rate0;
128}
129
130void
131ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
118 u_int8_t *rix, int *try0, u_int8_t *txrate)
119{
120 struct amrr_node *amn = ATH_NODE_AMRR(an);
121
122 *rix = amn->amn_tx_rix0;
123 *try0 = amn->amn_tx_try0;
124 if (shortPreamble)
125 *txrate = amn->amn_tx_rate0sp;
126 else
127 *txrate = amn->amn_tx_rate0;
128}
129
130void
131ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
132 struct ath_desc *ds, HAL_BOOL shortPreamble, u_int8_t rix)
132 struct ath_desc *ds, int shortPreamble, u_int8_t rix)
133{
134 struct amrr_node *amn = ATH_NODE_AMRR(an);
135
136 ath_hal_setupxtxdesc(sc->sc_ah, ds
137 , amn->amn_tx_rate1sp, amn->amn_tx_try1 /* series 1 */
138 , amn->amn_tx_rate2sp, amn->amn_tx_try2 /* series 2 */
139 , amn->amn_tx_rate3sp, amn->amn_tx_try3 /* series 3 */
140 );

--- 407 unchanged lines hidden ---
133{
134 struct amrr_node *amn = ATH_NODE_AMRR(an);
135
136 ath_hal_setupxtxdesc(sc->sc_ah, ds
137 , amn->amn_tx_rate1sp, amn->amn_tx_try1 /* series 1 */
138 , amn->amn_tx_rate2sp, amn->amn_tx_try2 /* series 2 */
139 , amn->amn_tx_rate3sp, amn->amn_tx_try3 /* series 3 */
140 );

--- 407 unchanged lines hidden ---