Wed Apr 15 05:40:48 2015 UTC ()

Register iwm(4) with pmf(9).

Patch from Pierre Pronchery.


(nonaka)

diff -r1.29 -r1.30 src/sys/dev/pci/if_iwm.c

--- src/sys/dev/pci/if_iwm.c 2015/03/26 14:42:56	1.29
+++ src/sys/dev/pci/if_iwm.c 2015/04/15 05:40:48	1.30

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $	*/
+/*	$NetBSD: if_iwm.c,v 1.30 2015/04/15 05:40:48 nonaka Exp $	*/
 /*	OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp	*/
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 @@ -95,27 +95,27 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.30 2015/04/15 05:40:48 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 @@ -6606,26 +6606,31 @@ iwm_attach_hook(device_t dev)
 	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(ic, iwm_media_change, ieee80211_media_status);
 	ieee80211_announce(ic);
 	iwm_radiotap_attach(sc);
 	callout_init(&sc->sc_calib_to, 0);
 	callout_setfunc(&sc->sc_calib_to, iwm_calib_timeout, sc);
 	//task_set(&sc->init_task, iwm_init_task, sc);
 	if (pmf_device_register(dev, NULL, NULL))
 		pmf_class_network_register(dev, ifp);
 	else
 		aprint_error_dev(dev, "couldn't establish power handler\n");
+}
 static void
 iwm_attach(device_t parent, device_t self, void *aux)
+{
 	struct iwm_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	pci_intr_handle_t ih;
 	pcireg_t reg, memtype;
 	const char *intrstr;
 	int error;
 	int txq_i;