From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 10 Jan 2006 14:14:00 +0000 (+0000)
Subject: do not try to hold serializer in nge_rxeof(), since nge_rxeof() is called by
X-Git-Tag: v2.0.1~5400
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/66f6927cafd9987a5504be848697163bf7002918

do not try to hold serializer in nge_rxeof(), since nge_rxeof() is called by
nge_poll() and nge_intr() which already have held serializer

Reported-and-Tested-by: Steve O'Hara-Smith <steve at sohara.org>
---

diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index e26740ff4c..c8a97e6b26 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.36 2005/12/31 14:07:59 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.37 2006/01/10 14:14:00 sephe Exp $
  */
 
 /*
@@ -1284,12 +1284,10 @@ nge_rxeof(struct nge_softc *sc)
 		 * If we received a packet with a vlan tag, pass it
 		 * to vlan_input() instead of ether_input().
 		 */
-		lwkt_serialize_enter(ifp->if_serializer);
 		if (extsts & NGE_RXEXTSTS_VLANPKT)
 			VLAN_INPUT_TAG(m, extsts & NGE_RXEXTSTS_VTCI);
 		else
 			ifp->if_input(ifp, m);
-		lwkt_serialize_exit(ifp->if_serializer);
 	}
 
 	sc->nge_cdata.nge_rx_prod = i;