[src/trunk]: src/sys/net80211 In the input path, do not discard management fr...

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

details:   https://anonhg.NetBSD.org/src/rev/854c11973adf
branches:  trunk
changeset: 553938:854c11973adf
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Oct 23 06:30:32 2003 +0000

description:
In the input path, do not discard management frames belonging to
a different BSS, because that keeps drivers like atw from detecting
ad hoc beacons with the same SSID but different BSSID for the
purpose of IBSS merges.

This should be revisited: maybe drivers should check for beacons
before handing packets up with ieee80211_input(). However, this
restores the atw(4) to working like it did with the old 802.11
layer, and it *is* nice to re-use the 802.11 layer's packet-decode
& -dispatch code (i.e., the ic_recv_mgmt callback).

diffstat:

 sys/net80211/ieee80211_input.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 783f22d0c52f -r 854c11973adf sys/net80211/ieee80211_input.c
--- a/sys/net80211/ieee80211_input.c    Thu Oct 23 05:25:29 2003 +0000
+++ b/sys/net80211/ieee80211_input.c    Thu Oct 23 06:30:32 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_input.c,v 1.9 2003/10/18 05:06:43 itojun Exp $       */
+/*     $NetBSD: ieee80211_input.c,v 1.10 2003/10/23 06:30:32 dyoung 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_input.c,v 1.8 2003/08/19 22:17:03 sam Exp $");
 #else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.9 2003/10/18 05:06:43 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.10 2003/10/23 06:30:32 dyoung Exp $");
 #endif
 
 #include "opt_inet.h"
@@ -157,8 +157,8 @@
                                bssid = wh->i_addr1;
                        if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) &&
                            !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr) &&
-                           (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) !=
-                           IEEE80211_FC0_TYPE_CTL) {
+                           (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) ==
+                           IEEE80211_FC0_TYPE_DATA) {
                                /* not interested in */
                                IEEE80211_DPRINTF2(("%s: other bss %s\n",
                                        __func__, ether_sprintf(wh->i_addr3)));