Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the input path, do not discard management frames belonging to

Browse Source 
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).
This commit is contained in:
dyoung 2003-10-23 06:30:32 +00:00
parent 27d4af4355
commit 38a484b2d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net80211/ieee80211_input.c
View File

@ -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) 2001 Atsushi Onoe
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@ -35,7 +35,7 @@
#ifdef __FreeBSD__ #ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.8 2003/08/19 22:17:03 sam Exp $"); __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.8 2003/08/19 22:17:03 sam Exp $");
#else #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 #endif
#include "opt_inet.h" #include "opt_inet.h"
@ -157,8 +157,8 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni,
bssid = wh->i_addr1; bssid = wh->i_addr1;
if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) && if (!IEEE80211_ADDR_EQ(bssid, ic->ic_bss->ni_bssid) &&
!IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr) && !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr) &&
(wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) ==
IEEE80211_FC0_TYPE_CTL) { IEEE80211_FC0_TYPE_DATA) {
/* not interested in */ /* not interested in */
IEEE80211_DPRINTF2(("%s: other bss %s\n", IEEE80211_DPRINTF2(("%s: other bss %s\n",
__func__, ether_sprintf(wh->i_addr3))); __func__, ether_sprintf(wh->i_addr3)));