Author: jfv
Date: Sat Apr 10 19:25:55 2010
New Revision: 206460
URL: http://svn.freebsd.org/changeset/base/206460
Log:
The lock move in rxeof necessitated a couple
more places to do the locking, fixes a panic.
Modified:
head/sys/dev/e1000/if_em.c
Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c Sat Apr 10 18:38:11 2010 (r206459)
+++ head/sys/dev/e1000/if_em.c Sat Apr 10 19:25:55 2010 (r206460)
@@ -1371,7 +1371,9 @@ em_poll(struct ifnet *ifp, enum poll_cmd
}
EM_CORE_UNLOCK(adapter);
+ EM_RX_LOCK(rxr);
rx_done = em_rxeof(rxr, count);
+ EM_RX_UNLOCK(rxr);
EM_TX_LOCK(txr);
em_txeof(txr);
@@ -1447,7 +1449,10 @@ em_handle_que(void *context, int pending
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+ EM_RX_LOCK(rxr);
more_rx = em_rxeof(rxr, adapter->rx_process_limit);
+ EM_RX_UNLOCK(rxr);
+
EM_TX_LOCK(txr);
em_txeof(txr);
#ifdef EM_MULTIQUEUE
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
