From debb1200cc0bff2eba8158839681e887a4f3e0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 30 Nov 2007 18:39:56 +0000 Subject: [PATCH] Accidently removed our changes when updating to the FreeBSD 7 version of the driver. Ingo, this is your chance to remind me of the vendor branch : git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23031 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/network/3com/pci/if_xl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/add-ons/kernel/drivers/network/3com/pci/if_xl.c b/src/add-ons/kernel/drivers/network/3com/pci/if_xl.c index 9ac3d55de0..1ccfcc32ab 100644 --- a/src/add-ons/kernel/drivers/network/3com/pci/if_xl.c +++ b/src/add-ons/kernel/drivers/network/3com/pci/if_xl.c @@ -2286,10 +2286,15 @@ xl_intr(void *arg) } #endif + #ifndef __HAIKU__ while ((status = CSR_READ_2(sc, XL_STATUS)) & XL_INTRS && status != 0xFFFF) { CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|(status & XL_INTRS)); +#else + status = atomic_and((int32 *)&sc->xl_intr_status, 0); + if ((status & XL_INTRS) != 0 && status != 0xFFFF) { +#endif if (status & XL_STAT_UP_COMPLETE) { int curpkts;