summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_iwi.c5
-rw-r--r--sys/dev/pci/if_iwivar.h4
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 80467528e84..54ec2e1b8bc 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.33 2005/04/04 16:31:52 damien Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.34 2005/04/04 16:37:07 damien Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -781,7 +781,6 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_buf *buf, int i,
tap->wr_chan_flags =
htole16(ic->ic_channels[frame->chan].ic_flags);
tap->wr_antsignal = frame->signal;
- tap->wr_antnoise = frame->noise;
tap->wr_antenna = frame->antenna;
M_DUP_PKTHDR(&mb, m);
@@ -1666,7 +1665,6 @@ iwi_config(struct iwi_softc *sc)
bzero(&config, sizeof config);
config.bluetooth_coexistence = 1;
config.multicast_enabled = 1;
- config.noise_reported = 1;
DPRINTF(("Configuring adapter\n"));
error = iwi_cmd(sc, IWI_CMD_SET_CONFIGURATION, &config, sizeof config,
0);
@@ -1808,7 +1806,6 @@ iwi_auth_and_assoc(struct iwi_softc *sc)
config.bluetooth_coexistence = 1;
config.multicast_enabled = 1;
config.bg_autodetection = 1;
- config.noise_reported = 1;
DPRINTF(("Configuring adapter\n"));
error = iwi_cmd(sc, IWI_CMD_SET_CONFIGURATION, &config,
sizeof config, 1);
diff --git a/sys/dev/pci/if_iwivar.h b/sys/dev/pci/if_iwivar.h
index fe28b1a4611..c30e98d7fd3 100644
--- a/sys/dev/pci/if_iwivar.h
+++ b/sys/dev/pci/if_iwivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwivar.h,v 1.9 2005/03/12 13:31:26 damien Exp $ */
+/* $OpenBSD: if_iwivar.h,v 1.10 2005/04/04 16:37:07 damien Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -34,7 +34,6 @@ struct iwi_rx_radiotap_header {
u_int16_t wr_chan_freq;
u_int16_t wr_chan_flags;
u_int8_t wr_antsignal;
- u_int8_t wr_antnoise;
u_int8_t wr_antenna;
} __packed;
@@ -43,7 +42,6 @@ struct iwi_rx_radiotap_header {
(1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) | \
(1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \
- (1 << IEEE80211_RADIOTAP_DB_ANTNOISE) | \
(1 << IEEE80211_RADIOTAP_ANTENNA))
struct iwi_tx_radiotap_header {