[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/809bf4c83bb0
branches:  netbsd-7
changeset: 798729:809bf4c83bb0
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 21 19:32:48 2014 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #338):
        sys/dev/pci/if_wpi.c: revision 1.69
Consistently take the interface down when the radio swicth is off.

diffstat:

 sys/dev/pci/if_wpi.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 877735ee3875 -r 809bf4c83bb0 sys/dev/pci/if_wpi.c
--- a/sys/dev/pci/if_wpi.c      Sun Dec 21 19:30:20 2014 +0000
+++ b/sys/dev/pci/if_wpi.c      Sun Dec 21 19:32:48 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $     */
+/*     $NetBSD: if_wpi.c,v 1.68.2.1 2014/12/21 19:32:48 snj Exp $      */
 
 /*-
  * Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.68 2014/08/08 10:17:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.68.2.1 2014/12/21 19:32:48 snj Exp $");
 
 /*
  * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -3170,6 +3170,7 @@
        if (wpi_getrfkill(sc)) {
                aprint_error_dev(sc->sc_dev,
                    "radio is disabled by hardware switch\n");
+               ifp->if_flags &= ~IFF_UP;
                error = EBUSY;
                goto fail1;
        }