[src/trunk]: src/sys/dev/pci Fix "ifconfig iwm0" failures reported by ryoon@n...

[knakahara <knakahara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6732bb1dabf
branches:  trunk
changeset: 319729:a6732bb1dabf
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Fri Jun 08 11:09:24 2018 +0000

description:
Fix "ifconfig iwm0" failures reported by ryoon@n.o. Advised nonaka@n.o and ozaki-r@n.o, thanks.

diffstat:

 sys/dev/pci/if_iwm.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 194c07ea3721 -r a6732bb1dabf sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Fri Jun 08 04:24:12 2018 +0000
+++ b/sys/dev/pci/if_iwm.c      Fri Jun 08 11:09:24 2018 +0000
@@ -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 @@
                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;