summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorkiyohara <kiyohara@NetBSD.org>2007-06-16 11:09:31 +0000
committerkiyohara <kiyohara@NetBSD.org>2007-06-16 11:09:31 +0000
commitcc7db3d88beefe28f6ac77dd85bf3a6d5bc111af (patch)
tree35a9a42cffc651358981a18f3157899a363aebcf /sys/dev
parentb89e8f1348c5429352e88538cc89d9ad2515b1dc (diff)
splnet() is called earlier than bpf_mtap2().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_zyd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 6bdc3583cba..d99782c3d6d 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.3 2007/06/16 11:02:19 kiyohara Exp $ */
+/* $NetBSD: if_zyd.c,v 1.4 2007/06/16 11:09:31 kiyohara Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.3 2007/06/16 11:02:19 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.4 2007/06/16 11:09:31 kiyohara Exp $");
#include "bpfilter.h"
@@ -1928,6 +1928,8 @@ zyd_rx_data(struct zyd_softc *sc, const uint8_t *buf, uint16_t len)
m->m_pkthdr.len = m->m_len = rlen;
bcopy((const uint8_t *)(plcp + 1), mtod(m, uint8_t *), rlen);
+ s = splnet();
+
#if NBPFILTER > 0
if (sc->sc_drvbpf != NULL) {
struct zyd_rx_radiotap_header *tap = &sc->sc_rxtap;
@@ -1947,7 +1949,6 @@ zyd_rx_data(struct zyd_softc *sc, const uint8_t *buf, uint16_t len)
}
#endif
- s = splnet();
wh = mtod(m, struct ieee80211_frame *);
ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh);
ieee80211_input(ic, m, ni, stat->rssi, 0);