Module Name: src
Committed By: riz
Date: Sat May 19 15:28:01 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wpi.c
Log Message:
Pull up following revision(s) (requested by khorben in ticket #266):
sys/dev/pci/if_wpi.c: revision 1.51
No longer wrongly advertise ad-hoc (IBSS) mode as being supported.
Fixes kern/46101
No objection from current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.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.50 src/sys/dev/pci/if_wpi.c:1.50.2.1
--- src/sys/dev/pci/if_wpi.c:1.50 Mon Jan 30 19:41:21 2012
+++ src/sys/dev/pci/if_wpi.c Sat May 19 15:28:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $ */
+/* $NetBSD: if_wpi.c,v 1.50.2.1 2012/05/19 15:28:00 riz Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.50 2012/01/30 19:41:21 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.50.2.1 2012/05/19 15:28:00 riz Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -310,7 +310,9 @@ wpi_attach(device_t parent __unused, dev
/* set device capabilities */
ic->ic_caps =
+#ifdef netyet
IEEE80211_C_IBSS | /* IBSS mode support */
+#endif
IEEE80211_C_WPA | /* 802.11i */
IEEE80211_C_MONITOR | /* monitor mode supported */
IEEE80211_C_TXPMGT | /* tx power management */
