diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-02-10 22:32:05 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-02-10 22:32:05 +0000 |
| commit | 3195bdf3b6357fac0a668e9a152f2170ac260cfb (patch) | |
| tree | 2791e1c22499ec837aff8baf854eaa6229eb7f9d /sys | |
| parent | 836a49c2ed973c56f65e96d13ee4e779c4177bfb (diff) | |
In iwm(4), call ieee80211_media_init() after overriding net80211 state
machine methods, like other drivers do.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 09ab2bb416c..1ecd288741a 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.12 2015/02/10 22:09:11 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.13 2015/02/10 22:32:04 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -6350,13 +6350,13 @@ iwm_preinit(struct iwm_softc *sc) /* Reattach net80211 so MAC address and channel map are picked up. */ ieee80211_ifdetach(ifp); ieee80211_ifattach(ifp); - ieee80211_media_init(ifp, iwm_media_change, ieee80211_media_status); ic->ic_node_alloc = iwm_node_alloc; /* Override 802.11 state transition machine. */ sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = iwm_newstate; + ieee80211_media_init(ifp, iwm_media_change, ieee80211_media_status); return 0; } |