From 6e12370632e79c830524121dbc85071b333ad64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Tue, 29 Dec 2009 18:12:17 +0000 Subject: [PATCH] * Disable interrupts only once, to prevent misbehaviour of hardware. Though I don't know about such hardware, it is better to be cautious here. * Code style cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34809 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c | 4 +++- src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c index 1d22322d8f..1347af5c85 100644 --- a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c +++ b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c @@ -897,7 +897,7 @@ an_rxeof(struct an_softc *sc) */ if (!(sc->an_monitor & AN_MONITOR_INCLUDE_BEACON) && - (rx_frame.an_frame_ctl & + (rx_frame.an_frame_ctl & IEEE80211_FC0_SUBTYPE_BEACON)) { return; } @@ -1233,8 +1233,10 @@ an_intr(void *xsc) ifp = sc->an_ifp; +#if !defined(__HAIKU__) /* Disable interrupts. */ CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0); +#endif status = CSR_READ_2(sc, AN_EVENT_STAT(sc->mpi350)); CSR_WRITE_2(sc, AN_EVENT_ACK(sc->mpi350), ~AN_INTRS(sc->mpi350)); diff --git a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c index f1720a23db..1b6f594464 100644 --- a/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c @@ -38,8 +38,8 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) if (sc->an_gone) return 0; - /* Disable interrupts. */ CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0); + // Disable interrupts. return 1; }