Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes from Masao Uebayashi

This commit is contained in:
bouyer 2009-04-04 15:31:47 +00:00
parent 3b4cda0de7
commit 7f8c56170f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/if_bridge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_bridge.c,v 1.65 2009/04/04 10:00:23 bouyer Exp $ */
/* $NetBSD: if_bridge.c,v 1.66 2009/04/04 15:31:47 bouyer Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.65 2009/04/04 10:00:23 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.66 2009/04/04 15:31:47 bouyer Exp $");
#include "opt_bridge_ipf.h"
#include "opt_inet.h"
@ -419,8 +419,6 @@ bridge_clone_destroy(struct ifnet *ifp)
/* Tear down the routing table. */
bridge_rtable_fini(sc);
softint_disestablish(sc->sc_softintr);
free(sc, M_DEVBUF);
@ -1327,10 +1325,13 @@ bridge_forward(void *v)
struct ether_header *eh;
int s;
if ((sc->sc_if.if_flags & IFF_RUNNING) == 0)
mutex_enter(softnet_lock);
if ((sc->sc_if.if_flags & IFF_RUNNING) == 0) {
mutex_exit(softnet_lock);
return;
}
s = splbio();
s = splnet();
while (1) {
IFQ_POLL(&sc->sc_if.if_snd, m);
if (m == NULL)
@ -1451,6 +1452,7 @@ bridge_forward(void *v)
bridge_enqueue(sc, dst_if, m, 1);
}
splx(s);
mutex_exit(softnet_lock);
}
/*