svn commit: r357161 - head/sys/dev/msk

[Alexander Kabaev]

Author: kan
Date: Mon Jan 27 00:14:51 2020
New Revision: 357161
URL: https://svnweb.freebsd.org/changeset/base/357161

Log:
  Enter net epoch in msk_tick.
  
  One more instance of if_input being called outside of
  interrupt, by means of msk_handle_events.
  
  Differential Revision:  https://reviews.freebsd.org/D23379

Modified:
  head/sys/dev/msk/if_msk.c

Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c	Sun Jan 26 21:55:17 2020	(r357160)
+++ head/sys/dev/msk/if_msk.c	Mon Jan 27 00:14:51 2020	(r357161)
@@ -3374,6 +3374,7 @@ msk_txeof(struct msk_if_softc *sc_if, int idx)
 static void
 msk_tick(void *xsc_if)
 {
+	struct epoch_tracker et;
 	struct msk_if_softc *sc_if;
 	struct mii_data *mii;
 
@@ -3386,7 +3387,9 @@ msk_tick(void *xsc_if)
 	mii_tick(mii);
 	if ((sc_if->msk_flags & MSK_FLAG_LINK) == 0)
 		msk_miibus_statchg(sc_if->msk_if_dev);
+	NET_EPOCH_ENTER(et);
 	msk_handle_events(sc_if->msk_softc);
+	NET_EPOCH_EXIT(et);
 	msk_watchdog(sc_if);
 	callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if);
 }