f6930bec33
Replace various void * / int argument combinations with common structures: - ieee80211_ratectl_tx_status for *_tx_complete(); - ieee80211_ratectl_tx_stats for *_tx_update(); While here, improve amrr_tx_update() for a bit: 1. In case, if receiver is not known (typical for Ralink USB drivers), refresh Tx rate for all nodes on the interface. 2. There was a misuse: - otus(4) sends non-decreasing counters (as originally intended); - but ural(4), rum(4) and run(4) are using 'read & clear' registers to obtain statistics for some period of time (and those 'last period' values are used as arguments for tx_update()). If arguments are not big enough, they are just discarded after the next call. Fix: move counting into *_tx_update() (now otus(4) will zero out all node counters after every tx_update() call) Tested with: - Intel 3945BG (wpi(4)), STA mode. - WUSB54GC (rum(4)), STA / HOSTAP mode. - RTL8188EU (urtwn(4)), STA mode. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D8037
117 lines
3.1 KiB
C
117 lines
3.1 KiB
C
/*-
|
|
* Copyright (c) 2010 Bernhard Schmidt <bschmidt@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include "opt_wlan.h"
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/malloc.h>
|
|
#include <sys/module.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/sysctl.h>
|
|
|
|
#include <net/if.h>
|
|
#include <net/if_media.h>
|
|
#include <net/ethernet.h>
|
|
|
|
#ifdef INET
|
|
#include <netinet/in.h>
|
|
#include <netinet/if_ether.h>
|
|
#endif
|
|
|
|
#include <net80211/ieee80211_var.h>
|
|
#include <net80211/ieee80211_ratectl.h>
|
|
|
|
static void
|
|
none_init(struct ieee80211vap *vap)
|
|
{
|
|
}
|
|
|
|
static void
|
|
none_deinit(struct ieee80211vap *vap)
|
|
{
|
|
IEEE80211_FREE(vap->iv_rs, M_80211_RATECTL);
|
|
}
|
|
|
|
static void
|
|
none_node_init(struct ieee80211_node *ni)
|
|
{
|
|
ni->ni_txrate = ni->ni_rates.rs_rates[0] & IEEE80211_RATE_VAL;
|
|
}
|
|
|
|
static void
|
|
none_node_deinit(struct ieee80211_node *ni)
|
|
{
|
|
}
|
|
|
|
static int
|
|
none_rate(struct ieee80211_node *ni, void *arg __unused, uint32_t iarg __unused)
|
|
{
|
|
int rix = 0;
|
|
|
|
ni->ni_txrate = ni->ni_rates.rs_rates[rix] & IEEE80211_RATE_VAL;
|
|
return rix;
|
|
}
|
|
|
|
static void
|
|
none_tx_complete(const struct ieee80211_node *ni,
|
|
const struct ieee80211_ratectl_tx_status *status)
|
|
{
|
|
}
|
|
|
|
static void
|
|
none_tx_update(struct ieee80211vap *vap,
|
|
struct ieee80211_ratectl_tx_stats *stats)
|
|
{
|
|
}
|
|
|
|
static void
|
|
none_setinterval(const struct ieee80211vap *vap, int msecs)
|
|
{
|
|
}
|
|
|
|
/* number of references from net80211 layer */
|
|
static int nrefs = 0;
|
|
|
|
static const struct ieee80211_ratectl none = {
|
|
.ir_name = "none",
|
|
.ir_attach = NULL,
|
|
.ir_detach = NULL,
|
|
.ir_init = none_init,
|
|
.ir_deinit = none_deinit,
|
|
.ir_node_init = none_node_init,
|
|
.ir_node_deinit = none_node_deinit,
|
|
.ir_rate = none_rate,
|
|
.ir_tx_complete = none_tx_complete,
|
|
.ir_tx_update = none_tx_update,
|
|
.ir_setinterval = none_setinterval,
|
|
};
|
|
IEEE80211_RATECTL_MODULE(ratectl_none, 1);
|
|
IEEE80211_RATECTL_ALG(none, IEEE80211_RATECTL_NONE, none);
|