Deleted Added
full compact
onoe.c (186804) onoe.c (218160)
1/*-
2 * Copyright (c) 2002-2007 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

--- 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) 2002-2007 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

--- 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/ath_rate/onoe/onoe.c 186804 2009-01-06 01:36:36Z sam $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/ath_rate/onoe/onoe.c 218160 2011-02-01 08:10:18Z adrian $");
32
33/*
34 * Atsushi Onoe's rate control algorithm.
35 */
36#include "opt_inet.h"
37#include "opt_wlan.h"
38
39#include <sys/param.h>

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

117 *rix = on->on_tx_rix0;
118 *try0 = on->on_tx_try0;
119 if (shortPreamble)
120 *txrate = on->on_tx_rate0sp;
121 else
122 *txrate = on->on_tx_rate0;
123}
124
32
33/*
34 * Atsushi Onoe's rate control algorithm.
35 */
36#include "opt_inet.h"
37#include "opt_wlan.h"
38
39#include <sys/param.h>

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

117 *rix = on->on_tx_rix0;
118 *try0 = on->on_tx_try0;
119 if (shortPreamble)
120 *txrate = on->on_tx_rate0sp;
121 else
122 *txrate = on->on_tx_rate0;
123}
124
125/*
126 * Get the TX rates.
127 *
128 * The short preamble bits aren't set here; the caller should augment
129 * the returned rate with the relevant preamble rate flag.
130 */
125void
131void
132ath_rate_getxtxrates(struct ath_softc *sc, struct ath_node *an,
133 uint8_t rix0, uint8_t *rix, uint8_t *try)
134{
135 struct onoe_node *on = ATH_NODE_ONOE(an);
136
137/* rix[0] = on->on_tx_rate0; */
138 rix[1] = on->on_tx_rate1;
139 rix[2] = on->on_tx_rate2;
140 rix[3] = on->on_tx_rate3;
141
142 try[0] = on->on_tx_try0;
143 try[1] = 2;
144 try[2] = 2;
145 try[3] = 2;
146}
147
148void
126ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
127 struct ath_desc *ds, int shortPreamble, u_int8_t rix)
128{
129 struct onoe_node *on = ATH_NODE_ONOE(an);
130
131 ath_hal_setupxtxdesc(sc->sc_ah, ds
132 , on->on_tx_rate1sp, 2 /* series 1 */
133 , on->on_tx_rate2sp, 2 /* series 2 */

--- 271 unchanged lines hidden ---
149ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
150 struct ath_desc *ds, int shortPreamble, u_int8_t rix)
151{
152 struct onoe_node *on = ATH_NODE_ONOE(an);
153
154 ath_hal_setupxtxdesc(sc->sc_ah, ds
155 , on->on_tx_rate1sp, 2 /* series 1 */
156 , on->on_tx_rate2sp, 2 /* series 2 */

--- 271 unchanged lines hidden ---