[src/netbsd-2-0]: src/sys/net80211 Pull up revision 1.16 (requested by dyoung...

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

details:   https://anonhg.NetBSD.org/src/rev/f0ec2f00a63c
branches:  netbsd-2-0
changeset: 561295:f0ec2f00a63c
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon Jun 07 06:36:41 2004 +0000

description:
Pull up revision 1.16 (requested by dyoung in ticket #449).

Fix for kern/25604: ifconfig wi0 media DS11 panics system.

In ieee80211_chan2mode, do not dereference the marker for "any
channel," IEEE80211_CHAN_ANYC.

diffstat:

 sys/net80211/ieee80211.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 859edb94bd2f -r f0ec2f00a63c sys/net80211/ieee80211.c
--- a/sys/net80211/ieee80211.c  Mon Jun 07 06:30:11 2004 +0000
+++ b/sys/net80211/ieee80211.c  Mon Jun 07 06:36:41 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211.c,v 1.9 2004/01/13 23:37:29 dyoung Exp $     */
+/*     $NetBSD: ieee80211.c,v 1.9.2.1 2004/06/07 06:36:41 jdc Exp $    */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -35,7 +35,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.8 2003/09/14 22:32:18 sam Exp $");
 #else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.9 2004/01/13 23:37:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211.c,v 1.9.2.1 2004/06/07 06:36:41 jdc Exp $");
 #endif
 
 /*
@@ -792,7 +792,8 @@
         * NB: this assumes the channel would not be supplied to us
         *     unless it was already compatible with the current mode.
         */
-       if (ic->ic_curmode != IEEE80211_MODE_AUTO)
+       if (ic->ic_curmode != IEEE80211_MODE_AUTO ||
+           chan == IEEE80211_CHAN_ANYC)
                return ic->ic_curmode;
        /*
         * In autoselect mode; deduce a mode based on the channel