d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[net80211] re-revert the ibss "is this local to the bss" patch.

Browse Source 
avos@ pointed out to me that this broke IBSS merging because the rest of
the input path no longer was called for non-IBSS frames.

I committed a change to not input non-IBSS frames, which stopped
nodes being created for BSSes that weren't ours.  Unfortunately
thta stopped the input path for non-IBSS frames in general,
so the management input path didn't work.

So, I'll revert this until I come up with a better solution.
(Hopefully before 11.)

Reviewed by:	avos
Approved by:	re (gjb)
This commit is contained in:
Adrian Chadd 2016-06-25 20:31:20 +00:00
parent 4edfc1e3bf
commit a56a0ef314
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net80211/ieee80211_adhoc.c
View File

@ -371,7 +371,10 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m,
/*
* Validate the bssid.
*/
if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
if (!(type == IEEE80211_FC0_TYPE_MGT &&
(subtype == IEEE80211_FC0_SUBTYPE_BEACON ||
subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) &&
!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
!IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) {
/* not interested in */
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,