Module Name: src
Committed By: roy
Date: Fri Apr 8 14:30:47 UTC 2016
Modified Files:
src/sys/net80211: ieee80211_ioctl.h ieee80211_node.c ieee80211_node.h
ieee80211_rssadapt.h ieee80211_var.h
Log Message:
Revert prior.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211_ioctl.h
cvs rdiff -u -r1.70 -r1.71 src/sys/net80211/ieee80211_node.c
cvs rdiff -u -r1.26 -r1.27 src/sys/net80211/ieee80211_node.h
cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_rssadapt.h
cvs rdiff -u -r1.29 -r1.30 src/sys/net80211/ieee80211_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211_ioctl.h
diff -u src/sys/net80211/ieee80211_ioctl.h:1.22 src/sys/net80211/ieee80211_ioctl.h:1.23
--- src/sys/net80211/ieee80211_ioctl.h:1.22 Wed Apr 6 14:42:16 2016
+++ src/sys/net80211/ieee80211_ioctl.h Fri Apr 8 14:30:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_ioctl.h,v 1.22 2016/04/06 14:42:16 roy Exp $ */
+/* $NetBSD: ieee80211_ioctl.h,v 1.23 2016/04/08 14:30:47 roy Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -356,7 +356,7 @@ struct ieee80211req_sta_info {
u_int16_t isi_flags; /* channel flags */
u_int16_t isi_state; /* state flags */
u_int8_t isi_authmode; /* authentication algorithm */
- int8_t isi_rssi;
+ u_int8_t isi_rssi;
u_int8_t isi_capinfo; /* capabilities */
u_int8_t isi_erp; /* ERP element */
u_int8_t isi_macaddr[IEEE80211_ADDR_LEN];
@@ -524,8 +524,8 @@ struct ieee80211req_scan_result {
u_int16_t isr_len; /* length (mult of 4) */
u_int16_t isr_freq; /* MHz */
u_int16_t isr_flags; /* channel flags */
- int8_t isr_noise;
- int8_t isr_rssi;
+ u_int8_t isr_noise;
+ u_int8_t isr_rssi;
u_int8_t isr_intval; /* beacon interval */
u_int8_t isr_capinfo; /* capabilities */
u_int8_t isr_erp; /* ERP element */
Index: src/sys/net80211/ieee80211_node.c
diff -u src/sys/net80211/ieee80211_node.c:1.70 src/sys/net80211/ieee80211_node.c:1.71
--- src/sys/net80211/ieee80211_node.c:1.70 Wed Apr 6 14:42:16 2016
+++ src/sys/net80211/ieee80211_node.c Fri Apr 8 14:30:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.c,v 1.70 2016/04/06 14:42:16 roy Exp $ */
+/* $NetBSD: ieee80211_node.c,v 1.71 2016/04/08 14:30:47 roy Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.70 2016/04/06 14:42:16 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.71 2016/04/08 14:30:47 roy Exp $");
#endif
#ifdef _KERNEL_OPT
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_no
static struct ieee80211_node *node_alloc(struct ieee80211_node_table *);
static void node_cleanup(struct ieee80211_node *);
static void node_free(struct ieee80211_node *);
-static int8_t node_getrssi(const struct ieee80211_node *);
+static u_int8_t node_getrssi(const struct ieee80211_node *);
static void ieee80211_setup_node(struct ieee80211_node_table *,
struct ieee80211_node *, const u_int8_t *);
@@ -589,7 +589,7 @@ ieee80211_node_compare(struct ieee80211c
const struct ieee80211_node *b)
{
u_int8_t maxa, maxb;
- int8_t rssia, rssib;
+ u_int8_t rssia, rssib;
int weight;
/* privacy support preferred */
@@ -1001,7 +1001,7 @@ node_free(struct ieee80211_node *ni)
free(ni, M_80211_NODE);
}
-static int8_t
+static u_int8_t
node_getrssi(const struct ieee80211_node *ni)
{
return ni->ni_rssi;
@@ -2347,12 +2347,12 @@ done:
ieee80211_free_node(ni);
}
-int8_t
+u_int8_t
ieee80211_getrssi(struct ieee80211com *ic)
{
#define NZ(x) ((x) == 0 ? 1 : (x))
struct ieee80211_node_table *nt = &ic->ic_sta;
- int32_t rssi_samples, rssi_total;
+ u_int32_t rssi_samples, rssi_total;
struct ieee80211_node *ni;
rssi_total = 0;
Index: src/sys/net80211/ieee80211_node.h
diff -u src/sys/net80211/ieee80211_node.h:1.26 src/sys/net80211/ieee80211_node.h:1.27
--- src/sys/net80211/ieee80211_node.h:1.26 Wed Apr 6 14:42:16 2016
+++ src/sys/net80211/ieee80211_node.h Fri Apr 8 14:30:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.h,v 1.26 2016/04/06 14:42:16 roy Exp $ */
+/* $NetBSD: ieee80211_node.h,v 1.27 2016/04/08 14:30:47 roy Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -120,7 +120,7 @@ struct ieee80211_node {
/* hardware */
u_int32_t ni_rstamp; /* recv timestamp */
- int8_t ni_rssi; /* recv ssi */
+ u_int8_t ni_rssi; /* recv ssi */
/* header */
u_int8_t ni_macaddr[IEEE80211_ADDR_LEN];
@@ -286,7 +286,7 @@ struct ieee80211_node *ieee80211_fakeup_
struct ieee80211_node_table *, const u_int8_t macaddr[]);
void ieee80211_node_join(struct ieee80211com *, struct ieee80211_node *,int);
void ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *);
-int8_t ieee80211_getrssi(struct ieee80211com *ic);
+u_int8_t ieee80211_getrssi(struct ieee80211com *ic);
/*
* Parameters supplied when adding/updating an entry in a
Index: src/sys/net80211/ieee80211_rssadapt.h
diff -u src/sys/net80211/ieee80211_rssadapt.h:1.8 src/sys/net80211/ieee80211_rssadapt.h:1.9
--- src/sys/net80211/ieee80211_rssadapt.h:1.8 Wed Apr 6 14:42:16 2016
+++ src/sys/net80211/ieee80211_rssadapt.h Fri Apr 8 14:30:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_rssadapt.h,v 1.8 2016/04/06 14:42:16 roy Exp $ */
+/* $NetBSD: ieee80211_rssadapt.h,v 1.9 2016/04/08 14:30:47 roy Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
@@ -79,7 +79,7 @@ struct ieee80211_rssdesc {
u_int id_len; /* Tx packet length */
u_int id_rateidx; /* index into ni->ni_rates */
struct ieee80211_node *id_node; /* destination STA MAC */
- int8_t id_rssi; /* destination STA avg RSS @
+ u_int8_t id_rssi; /* destination STA avg RSS @
* Tx time
*/
};
Index: src/sys/net80211/ieee80211_var.h
diff -u src/sys/net80211/ieee80211_var.h:1.29 src/sys/net80211/ieee80211_var.h:1.30
--- src/sys/net80211/ieee80211_var.h:1.29 Wed Apr 6 14:42:16 2016
+++ src/sys/net80211/ieee80211_var.h Fri Apr 8 14:30:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_var.h,v 1.29 2016/04/06 14:42:16 roy Exp $ */
+/* $NetBSD: ieee80211_var.h,v 1.30 2016/04/08 14:30:47 roy Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -156,7 +156,7 @@ struct ieee80211com {
struct ieee80211_node *(*ic_node_alloc)(struct ieee80211_node_table*);
void (*ic_node_free)(struct ieee80211_node *);
void (*ic_node_cleanup)(struct ieee80211_node *);
- int8_t (*ic_node_getrssi)(const struct ieee80211_node*);
+ u_int8_t (*ic_node_getrssi)(const struct ieee80211_node*);
u_int16_t ic_lintval; /* listen interval */
u_int16_t ic_bintval; /* beacon interval */
u_int16_t ic_holdover; /* PM hold over duration */
