diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
| commit | 0a3437aa52c010dc2ab10b9778a383fef436382c (patch) | |
| tree | b2f879569f9d9deb23e4d7accb103d30a64e1527 /sys/dev/ath/ath_rate/sample | |
| parent | 6a0f7868a911546f7be04cc546e99cc803686af3 (diff) | |
| download | FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.zip FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.tar.gz | |
Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"
This reverts commit 6ee75bdd7bf7c20359dd6e38c243586cb062edea.
Diffstat (limited to 'sys/dev/ath/ath_rate/sample')
| -rw-r--r-- | sys/dev/ath/ath_rate/sample/sample.c | 6 | ||||
| -rw-r--r-- | sys/dev/ath/ath_rate/sample/sample.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c index 36cd679..b3f82fa 100644 --- a/sys/dev/ath/ath_rate/sample/sample.c +++ b/sys/dev/ath/ath_rate/sample/sample.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/malloc.h> #include <sys/mutex.h> #include <sys/errno.h> @@ -62,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_media.h> #include <net/if_arp.h> #include <net/ethernet.h> /* XXX for ether_sprintf */ @@ -891,8 +889,8 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, if (!mrr || ts->ts_finaltsi == 0) { if (!IS_RATE_DEFINED(sn, final_rix)) { - device_printf(sc->sc_dev, "%s: ts_rate=%d ts_finaltsi=%d, final_rix=%d\n", - __func__, ts->ts_rate, ts->ts_finaltsi, final_rix); + device_printf(sc->sc_dev, "%s: ts_rate=%d ts_finaltsi=%d\n", + __func__, ts->ts_rate, ts->ts_finaltsi); badrate(ifp, 0, ts->ts_rate, long_tries, status); return; } diff --git a/sys/dev/ath/ath_rate/sample/sample.h b/sys/dev/ath/ath_rate/sample/sample.h index 1c57dee..7438a3d 100644 --- a/sys/dev/ath/ath_rate/sample/sample.h +++ b/sys/dev/ath/ath_rate/sample/sample.h @@ -113,7 +113,7 @@ struct sample_node { #ifdef _KERNEL #define ATH_NODE_SAMPLE(an) ((struct sample_node *)&(an)[1]) -#define IS_RATE_DEFINED(sn, rix) (((uint64_t) (sn)->ratemask & (1ULL<<((uint64_t) rix))) != 0) +#define IS_RATE_DEFINED(sn, rix) (((sn)->ratemask & (1<<(rix))) != 0) #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) |
