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

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

details:   https://anonhg.NetBSD.org/src/rev/dd60635f5c4a
branches:  netbsd-6
changeset: 774130:dd60635f5c4a
user:      riz <riz%NetBSD.org@localhost>
date:      Sat May 19 15:28:00 2012 +0000

description:
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@

diffstat:

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

diffs (28 lines):

diff -r 516bbb884157 -r dd60635f5c4a sys/dev/pci/if_wpi.c
--- a/sys/dev/pci/if_wpi.c      Sat May 19 15:25:53 2012 +0000
+++ b/sys/dev/pci/if_wpi.c      Sat May 19 15:28:00 2012 +0000
@@ -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 @@
 
        /* 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 */