|
Lines 229-234
Link Here
|
| 229 |
} |
229 |
} |
| 230 |
#endif |
230 |
#endif |
| 231 |
break; |
231 |
break; |
|
|
232 |
case IEEE80211_S_RUN: /* IBSS merge */ |
| 233 |
break; |
| 232 |
default: |
234 |
default: |
| 233 |
goto invalid; |
235 |
goto invalid; |
| 234 |
} |
236 |
} |
|
Lines 369-375
Link Here
|
| 369 |
/* |
371 |
/* |
| 370 |
* Validate the bssid. |
372 |
* Validate the bssid. |
| 371 |
*/ |
373 |
*/ |
| 372 |
if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && |
374 |
if (!(type == IEEE80211_FC0_TYPE_MGT && |
|
|
375 |
(subtype == IEEE80211_FC0_SUBTYPE_BEACON || |
| 376 |
subtype == IEEE80211_FC0_SUBTYPE_PROBE_REQ)) && |
| 377 |
!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && |
| 373 |
!IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { |
378 |
!IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { |
| 374 |
/* not interested in */ |
379 |
/* not interested in */ |
| 375 |
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, |
380 |
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, |
|
Lines 409-415
Link Here
|
| 409 |
} |
414 |
} |
| 410 |
IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); |
415 |
IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi); |
| 411 |
ni->ni_noise = nf; |
416 |
ni->ni_noise = nf; |
| 412 |
if (HAS_SEQ(type)) { |
417 |
if (HAS_SEQ(type) && IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) { |
| 413 |
uint8_t tid = ieee80211_gettid(wh); |
418 |
uint8_t tid = ieee80211_gettid(wh); |
| 414 |
if (IEEE80211_QOS_HAS_SEQ(wh) && |
419 |
if (IEEE80211_QOS_HAS_SEQ(wh) && |
| 415 |
TID_TO_WME_AC(tid) >= WME_AC_VI) |
420 |
TID_TO_WME_AC(tid) >= WME_AC_VI) |