upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a mismerge in r206001.

Browse source 
PR:		146614
Approved by:	jfv (implicit)
MFC afer:	3 days
This commit is contained in:
Marius Strobl 2010-05-15 19:46:16 +00:00
parent 18bd63b7c5
commit 876ab8b5e4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/dev/e1000/if_em.c
View file

@ -710,6 +710,9 @@ em_detach(device_t dev)
ether_poll_deregister(ifp);
#endif
if (adapter->led_dev != NULL)
led_destroy(adapter->led_dev);
EM_CORE_LOCK(adapter);
adapter->in_detach = 1;
em_stop(adapter);
@ -779,9 +782,6 @@ em_resume(device_t dev)
struct adapter *adapter = device_get_softc(dev);
struct ifnet *ifp = adapter->ifp;
if (adapter->led_dev != NULL)
led_destroy(adapter->led_dev);
EM_CORE_LOCK(adapter);
em_init_locked(adapter);
em_init_manageability(adapter);