[net80211] re-revert the ibss "is this local to the bss" patch.
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:
parent
4edfc1e3bf
commit
a56a0ef314
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=302202
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user