Module Name: src
Committed By: snj
Date: Sun Dec 21 19:32:48 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wpi.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.2.1 src/sys/dev/pci/if_wpi.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_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.68 src/sys/dev/pci/if_wpi.c:1.68.2.1
--- src/sys/dev/pci/if_wpi.c:1.68 Fri Aug 8 10:17:07 2014
+++ src/sys/dev/pci/if_wpi.c Sun Dec 21 19:32:48 2014
@@ -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 @@ wpi_init(struct ifnet *ifp)
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;
}
