From: brad Date: Tue, 6 Jan 2015 04:05:43 +0000 (+0000) Subject: Always enable the receive filter. It was being enabled via sis_init() X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4d5329cf96e831074001a4ad8dce73189f6a5a5c;p=openbsd Always enable the receive filter. It was being enabled via sis_init() but not if calling sis_iff() via sis_ioctl(). --- diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index fcaa1b468a1..e1991124338 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.121 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_sis.c,v 1.122 2015/01/06 04:05:43 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. @@ -850,6 +850,8 @@ sis_iff_ns(struct sis_softc *sc) } CSR_WRITE_4(sc, SIS_RXFILT_CTL, rxfilt); + /* Turn the receive filter on. */ + CSR_WRITE_4(sc, SIS_RXFILT_CTL, rxfilt | SIS_RXFILTCTL_ENABLE); CSR_READ_4(sc, SIS_RXFILT_CTL); } @@ -916,6 +918,8 @@ sis_iff_sis(struct sis_softc *sc) } CSR_WRITE_4(sc, SIS_RXFILT_CTL, rxfilt); + /* Turn the receive filter on. */ + CSR_WRITE_4(sc, SIS_RXFILT_CTL, rxfilt | SIS_RXFILTCTL_ENABLE); CSR_READ_4(sc, SIS_RXFILT_CTL); } @@ -1785,9 +1789,6 @@ sis_init(void *xsc) */ sis_iff(sc); - /* Turn the receive filter on */ - SIS_SETBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ENABLE); - /* * Load the address of the RX and TX lists. */