[src/trunk]: src/sys/net80211 fix monitor mode channel.

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

details:   https://anonhg.NetBSD.org/src/rev/4ba008dbfca8
branches:  trunk
changeset: 326297:4ba008dbfca8
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 25 00:59:44 2014 +0000

description:
fix monitor mode channel.

diffstat:

 sys/net80211/ieee80211_ioctl.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 9e7a78c0d2b4 -r 4ba008dbfca8 sys/net80211/ieee80211_ioctl.c
--- a/sys/net80211/ieee80211_ioctl.c    Sat Jan 25 00:07:48 2014 +0000
+++ b/sys/net80211/ieee80211_ioctl.c    Sat Jan 25 00:59:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_ioctl.c,v 1.58 2013/09/12 20:44:02 martin Exp $      */
+/*     $NetBSD: ieee80211_ioctl.c,v 1.59 2014/01/25 00:59:44 christos Exp $    */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.58 2013/09/12 20:44:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.59 2014/01/25 00:59:44 christos Exp $");
 #endif
 
 /*
@@ -2837,6 +2837,9 @@
                                if (ic->ic_des_chan != IEEE80211_CHAN_ANYC &&
                                    ic->ic_bss->ni_chan != ic->ic_des_chan)
                                        error = ENETRESET;
+                       } else if (ic->ic_opmode == IEEE80211_M_MONITOR) {
+                               ic->ic_curchan = ic->ic_ibss_chan;
+                               error = ENETRESET;
                        } else {
                                if (ic->ic_bss->ni_chan != ic->ic_ibss_chan)
                                        error = ENETRESET;