diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2003-11-14 19:00:32 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2003-11-14 19:00:32 +0000 |
| commit | 5120abbfb44aea8edaca3311a60e73429dc71942 (patch) | |
| tree | 0e5901939d8633065a9035209aa5138fe4ea6820 /sys/pci/if_sis.c | |
| parent | 274461c9441dd719a672a8fef48458e127b3885e (diff) | |
| download | src-5120abbfb44aea8edaca3311a60e73429dc71942.tar.gz src-5120abbfb44aea8edaca3311a60e73429dc71942.zip | |
Drop the driver lock around calls to if_input to avoid a LOR when
the packets are immediately returned for sending (e.g. when bridging
or packet forwarding). There are more efficient ways to do this
but for now use the least intrusive approach.
Reviewed by: imp, rwatson
Notes
Notes:
svn path=/head/; revision=122689
Diffstat (limited to 'sys/pci/if_sis.c')
| -rw-r--r-- | sys/pci/if_sis.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index fec9a41b7cb8..bd3a26520140 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1594,6 +1594,8 @@ sis_rxeof(sc) int i, total_len = 0; u_int32_t rxstat; + SIS_LOCK_ASSERT(sc); + ifp = &sc->arpcom.ac_if; i = sc->sis_cdata.sis_rx_prod; @@ -1661,7 +1663,9 @@ sis_rxeof(sc) ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; + SIS_UNLOCK(sc); (*ifp->if_input)(ifp, m); + SIS_LOCK(sc); } sc->sis_cdata.sis_rx_prod = i; |