d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/hn: Consolidate hn_{suspend,resume}

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D8907
This commit is contained in:
sephe 2016-12-28 03:19:59 +00:00
parent 3e7ea7675d
commit c9b5e5f0a8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/hyperv/netvsc/if_hn.c
View File

@ -2367,9 +2367,6 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
break;
}
/* Disable polling. */
hn_polling(sc, 0);
/*
* Suspend this interface before the synthetic parts
* are ripped.
@ -2415,13 +2412,6 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
*/
hn_resume(sc);
/*
* Re-enable polling if this interface is running and
* the polling is requested.
*/
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && sc->hn_pollhz > 0)
hn_polling(sc, sc->hn_pollhz);
HN_UNLOCK(sc);
break;
@ -4900,6 +4890,9 @@ static void
hn_suspend(struct hn_softc *sc)
{
/* Disable polling. */
hn_polling(sc, 0);
if (sc->hn_ifp->if_drv_flags & IFF_DRV_RUNNING)
hn_suspend_data(sc);
hn_suspend_mgmt(sc);
@ -4992,6 +4985,13 @@ hn_resume(struct hn_softc *sc)
if (sc->hn_ifp->if_drv_flags & IFF_DRV_RUNNING)
hn_resume_data(sc);
hn_resume_mgmt(sc);
/*
* Re-enable polling if this interface is running and
* the polling is requested.
*/
if ((sc->hn_ifp->if_drv_flags & IFF_DRV_RUNNING) && sc->hn_pollhz > 0)
hn_polling(sc, sc->hn_pollhz);
}
static void