Module Name: src
Committed By: knakahara
Date: Fri Jun 8 11:09:24 UTC 2018
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Fix "ifconfig iwm0" failures reported by ryoon@n.o. Advised nonaka@n.o and
ozaki-r@n.o, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/if_iwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.80 src/sys/dev/pci/if_iwm.c:1.81
--- src/sys/dev/pci/if_iwm.c:1.80 Wed Jun 6 01:49:08 2018
+++ src/sys/dev/pci/if_iwm.c Fri Jun 8 11:09:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.80 2018/06/06 01:49:08 maya Exp $ */
+/* $NetBSD: if_iwm.c,v 1.81 2018/06/08 11:09:24 knakahara Exp $ */
/* OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp */
#define IEEE80211_NO_HT
/*
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.80 2018/06/06 01:49:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.81 2018/06/08 11:09:24 knakahara Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -7762,6 +7762,11 @@ iwm_preinit(struct iwm_softc *sc)
ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
ether_ifdetach(ifp);
+ /*
+ * XXX
+ * ether_ifdetach() overwrites ifp->if_ioctl, so restore it here.
+ */
+ ifp->if_ioctl = iwm_ioctl;
ieee80211_ifattach(ic);
ic->ic_node_alloc = iwm_node_alloc;
