From 3b4e5df82ccb53cbdb3abb9de8437f8c273302db Mon Sep 17 00:00:00 2001 From: Jack F Vogel Date: Sat, 10 Apr 2010 19:25:55 +0000 Subject: [PATCH] The lock move in rxeof necessitated a couple more places to do the locking, fixes a panic. --- sys/dev/e1000/if_em.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 091f7aa3f87..834e676a6af 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1371,7 +1371,9 @@ em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) } 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