d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in bpf/multicast support that caused multicast packets to get

Browse Source 
thrown out if bpfilter support and no BPF listener. (submitted by Bill
Fenner)
Removed unused variable and changed another from a stack variable to a
static - the variable was a rather large array of structs that consumed
a lot of stack space. (me)
This commit is contained in:
David Greenman 1995-05-22 05:51:41 +00:00
parent eb01b2314d
commit f8141f6f97
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8694
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/de/if_de.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_de.c,v 1.12 1995/05/05 19:44:06 thomas Exp $ * $Id: if_de.c,v 1.24 1995/05/05 20:09:51 davidg Exp $
* *
*/ */
@ -638,12 +638,10 @@ tulip_rx_intr(
#if NBPFILTER > 0 #if NBPFILTER > 0
if (sc->tulip_bpf != NULL) { if (sc->tulip_bpf != NULL) {
bpf_tap(sc->tulip_bpf, mtod(m, caddr_t), total_len); bpf_tap(sc->tulip_bpf, mtod(m, caddr_t), total_len);
if ((eh.ether_dhost[0] & 1) == 0 && if (sc->tulip_if.if_flags & IFF_PROMISC &&
(eh.ether_dhost[0] & 1) == 0 &&
!TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr))
goto next; goto next;
} else if (!TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)
&& !TULIP_ADDRBRDCST(eh.ether_dhost)) {
goto next;
} }
#endif #endif
accept = 1; accept = 1;
@ -801,7 +799,8 @@ tulip_start(
tulip_ringinfo_t *ri = &sc->tulip_txinfo; tulip_ringinfo_t *ri = &sc->tulip_txinfo;
tulip_desc_t *sop, *eop; tulip_desc_t *sop, *eop;
struct mbuf *m; struct mbuf *m;
tulip_addrvec_t addrvec[TULIP_MAX_TXSEG+1], *avp; static tulip_addrvec_t addrvec[TULIP_MAX_TXSEG+1];
tulip_addrvec_t *avp;
int segcnt; int segcnt;
tulip_uint32_t d_status; tulip_uint32_t d_status;
@ -1009,7 +1008,6 @@ tulip_read_srom(
const unsigned cmdmask = (SROMCMD_RD << bitwidth); const unsigned cmdmask = (SROMCMD_RD << bitwidth);
const unsigned msb = 1 << (bitwidth + 3 - 1); const unsigned msb = 1 << (bitwidth + 3 - 1);
unsigned lastidx = (1 << bitwidth) - 1; unsigned lastidx = (1 << bitwidth) - 1;
int lowbit = 0;
tulip_idle_srom(sc); tulip_idle_srom(sc);

12
sys/pci/if_de.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_de.c,v 1.12 1995/05/05 19:44:06 thomas Exp $ * $Id: if_de.c,v 1.24 1995/05/05 20:09:51 davidg Exp $
* *
*/ */
@ -638,12 +638,10 @@ tulip_rx_intr(
#if NBPFILTER > 0 #if NBPFILTER > 0
if (sc->tulip_bpf != NULL) { if (sc->tulip_bpf != NULL) {
bpf_tap(sc->tulip_bpf, mtod(m, caddr_t), total_len); bpf_tap(sc->tulip_bpf, mtod(m, caddr_t), total_len);
if ((eh.ether_dhost[0] & 1) == 0 && if (sc->tulip_if.if_flags & IFF_PROMISC &&
(eh.ether_dhost[0] & 1) == 0 &&
!TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)) !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr))
goto next; goto next;
} else if (!TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr)
&& !TULIP_ADDRBRDCST(eh.ether_dhost)) {
goto next;
} }
#endif #endif
accept = 1; accept = 1;
@ -801,7 +799,8 @@ tulip_start(
tulip_ringinfo_t *ri = &sc->tulip_txinfo; tulip_ringinfo_t *ri = &sc->tulip_txinfo;
tulip_desc_t *sop, *eop; tulip_desc_t *sop, *eop;
struct mbuf *m; struct mbuf *m;
tulip_addrvec_t addrvec[TULIP_MAX_TXSEG+1], *avp; static tulip_addrvec_t addrvec[TULIP_MAX_TXSEG+1];
tulip_addrvec_t *avp;
int segcnt; int segcnt;
tulip_uint32_t d_status; tulip_uint32_t d_status;
@ -1009,7 +1008,6 @@ tulip_read_srom(
const unsigned cmdmask = (SROMCMD_RD << bitwidth); const unsigned cmdmask = (SROMCMD_RD << bitwidth);
const unsigned msb = 1 << (bitwidth + 3 - 1); const unsigned msb = 1 << (bitwidth + 3 - 1);
unsigned lastidx = (1 << bitwidth) - 1; unsigned lastidx = (1 << bitwidth) - 1;
int lowbit = 0;
tulip_idle_srom(sc); tulip_idle_srom(sc);