1 --- a/net80211/ieee80211_scan_sta.c
2 +++ b/net80211/ieee80211_scan_sta.c
3 @@ -201,8 +201,10 @@ sta_flush_table(struct sta_table *st)
7 -saveie(u_int8_t **iep, const u_int8_t *ie)
8 +saveie(u_int8_t **iep, const u_int8_t *ie, int preserve)
10 + if (preserve && *iep)
15 @@ -304,10 +306,10 @@ found:
16 (const struct ieee80211_tim_ie *) sp->tim;
17 ise->se_dtimperiod = tim->tim_period;
19 - saveie(&ise->se_wme_ie, sp->wme);
20 - saveie(&ise->se_wpa_ie, sp->wpa);
21 - saveie(&ise->se_rsn_ie, sp->rsn);
22 - saveie(&ise->se_ath_ie, sp->ath);
23 + saveie(&ise->se_wme_ie, sp->wme, 0);
24 + saveie(&ise->se_wpa_ie, sp->wpa, !sp->isprobe);
25 + saveie(&ise->se_rsn_ie, sp->rsn, !sp->isprobe);
26 + saveie(&ise->se_ath_ie, sp->ath, 0);
28 /* clear failure count after STA_FAIL_AGE passes */
29 if (se->se_fails && (jiffies - se->se_lastfail) > STA_FAILS_AGE*HZ) {
30 --- a/net80211/ieee80211_input.c
31 +++ b/net80211/ieee80211_input.c
32 @@ -3106,6 +3106,7 @@ ieee80211_recv_mgmt(struct ieee80211vap
34 IEEE80211_VERIFY_LENGTH(efrm - frm, 12);
35 memset(&scan, 0, sizeof(scan));
36 + scan.isprobe = (subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) && IEEE80211_ADDR_EQ(wh->i_addr2, vap->iv_myaddr);
39 scan.bintval = le16toh(*(__le16 *)frm);
40 --- a/net80211/ieee80211_scan.h
41 +++ b/net80211/ieee80211_scan.h
42 @@ -133,6 +133,7 @@ struct ieee80211_scanparams {