summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2006-07-01 20:22:23 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2006-07-01 20:22:23 +0000
commit030973ef7bde4f5193a68e81bd08f76a2022eeb1 (patch)
tree70f6e0c48d43a7b3952f2f10d5757ee26b588093
parent4edf6156be16f3facacc7b9fa7076a650edfb27e (diff)
always report the channel as type 802.11b (IEEE802_CHAN_B) in the
net80211 node wrappers.
-rw-r--r--sys/dev/ic/if_wi.c5
-rw-r--r--sys/dev/ic/if_wi_hostap.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index d3edc64a5ab..5bd2de0ae0a 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.132 2006/07/01 19:30:51 reyk Exp $ */
+/* $OpenBSD: if_wi.c,v 1.133 2006/07/01 20:22:22 reyk Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -127,7 +127,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.132 2006/07/01 19:30:51 reyk Exp $";
+ "$OpenBSD: if_wi.c,v 1.133 2006/07/01 20:22:22 reyk Exp $";
#endif /* lint */
#ifdef foo
@@ -1955,6 +1955,7 @@ wi_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
IEEE80211_ADDR_COPY(nr.nr_macaddr, res->wi_bssid);
IEEE80211_ADDR_COPY(nr.nr_bssid, res->wi_bssid);
nr.nr_channel = letoh16(res->wi_chan);
+ nr.nr_chan_flags = IEEE80211_CHAN_B;
nr.nr_rssi = letoh16(res->wi_signal);
nr.nr_max_rssi = 0; /* XXX */
nr.nr_nwid_len = letoh16(res->wi_ssid_len);
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 6e215999857..0a941403608 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_hostap.c,v 1.35 2006/06/27 09:48:02 reyk Exp $ */
+/* $OpenBSD: if_wi_hostap.c,v 1.36 2006/07/01 20:22:22 reyk Exp $ */
/*
* Copyright (c) 2002
@@ -1341,6 +1341,8 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
IEEE80211_ADDR_COPY(nr.nr_macaddr, sta->addr);
IEEE80211_ADDR_COPY(nr.nr_bssid,
&sc->sc_ic.ic_myaddr);
+ nr.nr_channel = sc->wi_channel;
+ nr.nr_chan_flags = IEEE80211_CHAN_B;
nr.nr_associd = sta->asid;
nr.nr_rssi = sta->sig_info >> 8;
nr.nr_max_rssi = 0;