Author: davidcs
Date: Mon Oct 29 21:14:48 2018
New Revision: 339882
URL: https://svnweb.freebsd.org/changeset/base/339882
Log:
MFC r338734
Fixed isses:
State check before enqueuing transmit task in bxe_link_attn() routine.
State check before invoking bxe_nic_unload in bxe_shutdown().
Submitted by:vaishali.kulka...@cavium.com
Modified:
stable/10/sys/dev/bxe/bxe.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/bxe/bxe.c
==============================================================================
--- stable/10/sys/dev/bxe/bxe.c Mon Oct 29 21:09:39 2018 (r339881)
+++ stable/10/sys/dev/bxe/bxe.c Mon Oct 29 21:14:48 2018 (r339882)
@@ -7079,13 +7079,13 @@ bxe_link_attn(struct bxe_softc *sc)
if (sc->state == BXE_STATE_OPEN) {
bxe_stats_handle(sc, STATS_EVENT_LINK_UP);
+ /* Restart tx when the link comes back. */
+ FOR_EACH_ETH_QUEUE(sc, i) {
+ fp = &sc->fp[i];
+ taskqueue_enqueue(fp->tq, &fp->tx_task);
+ }
}
- /* Restart tx when the link comes back. */
- FOR_EACH_ETH_QUEUE(sc, i) {
- fp = &sc->fp[i];
- taskqueue_enqueue(fp->tq, &fp->tx_task);
- }
}
if (sc->link_vars.link_up && sc->link_vars.line_speed) {
@@ -16281,9 +16281,11 @@ bxe_shutdown(device_t dev)
/* stop the periodic callout */
bxe_periodic_stop(sc);
- BXE_CORE_LOCK(sc);
- bxe_nic_unload(sc, UNLOAD_NORMAL, FALSE);
- BXE_CORE_UNLOCK(sc);
+ if (sc->state != BXE_STATE_CLOSED) {
+ BXE_CORE_LOCK(sc);
+ bxe_nic_unload(sc, UNLOAD_NORMAL, FALSE);
+ BXE_CORE_UNLOCK(sc);
+ }
return (0);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
