summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_iwn.c
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2017-01-12 18:06:58 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2017-01-12 18:06:58 +0000
commitef4a3b67d10347ab36a9aeedd43baeeee3bdf5d6 (patch)
tree17c99cc82ee6e86a33c8e720781608e65c8f1d97 /sys/dev/pci/if_iwn.c
parent1392b50d062cb927b3ff62380856ed0edc29540c (diff)
Rename ieee80211_mira_node_destroy() to ieee80211_mira_cancel_timeouts().
No functional change. The previous name was chosen at a time when I could not yet anticipate what this function would really end up doing. The new name should make this function's purpose more obvious, especially where it appears at strategic places in driver code.
Diffstat (limited to 'sys/dev/pci/if_iwn.c')
-rw-r--r--sys/dev/pci/if_iwn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 16096e5722e..b49cc9f458e 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.180 2016/12/23 18:44:51 kettenis Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.181 2017/01/12 18:06:57 stsp Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1764,7 +1764,7 @@ iwn_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
if (ic->ic_state == IEEE80211_S_RUN &&
(ni->ni_flags & IEEE80211_NODE_HT))
- ieee80211_mira_node_destroy(&wn->mn);
+ ieee80211_mira_cancel_timeouts(&wn->mn);
switch (nstate) {
case IEEE80211_S_SCAN: