From 3af81264fa951878211504c04dcbb581e5467f1a Mon Sep 17 00:00:00 2001 From: stsp Date: Fri, 12 Jun 2015 13:11:27 +0000 Subject: [PATCH] Actually trigger iwm_init_task() from iwm_watchdog() as intended to give recovery after device timeout a chance. Don't mess with the IFF_UP flag in the watchdog since this isn't done anywhere except intel wifi drivers which probably copied this pattern amongst each other. ok kettenis@ --- sys/dev/pci/if_iwm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 0ffefc57677..f129041ebdf 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.42 2015/05/30 02:49:23 deraadt Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.43 2015/06/12 13:11:27 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh @@ -5720,8 +5720,7 @@ iwm_watchdog(struct ifnet *ifp) #ifdef IWM_DEBUG iwm_nic_error(sc); #endif - ifp->if_flags &= ~IFF_UP; - iwm_stop(ifp, 1); + task_add(systq, &sc->init_task); ifp->if_oerrors++; return; } -- 2.20.1