Project

General

Profile

Bug #1795

properly lock iwi watchdog function

Added by Johannes.Hofmann almost 10 years ago. Updated almost 10 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
-
Target version:
-
Start date:
Due date:
% Done:

0%

Estimated time:

Description

This patch properly locks the iwi watchdog function. I have no
idea, why it worked for me before without this.

Cheers,
Johannes

diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c
index eb70b8f..15a886f 100644
--- a/sys/dev/netif/iwi/if_iwi.c
+++ b/sys/dev/netif/iwi/if_iwi.c
@@ -1994,7 +1994,7 @@ iwi_watchdog(void *arg)
struct ifnet *ifp = sc->sc_ifp;
struct ieee80211com *ic = ifp->if_l2com;

- IWI_LOCK_ASSERT(sc);
+ IWI_LOCK(sc);

if (sc->sc_tx_timer > 0) {
if (--sc->sc_tx_timer == 0) {
@@ -2022,6 +2022,7 @@ iwi_watchdog(void *arg)
}
}
callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc);
+ IWI_UNLOCK(sc);
}

static int

History

#1

Updated by swildner almost 10 years ago

Committed, thanks.

ed7427803c01f7cbb86cf42ce9e40aa94710a794

Also available in: Atom PDF