Author: adrian
Date: Sun Jun 7 05:08:44 2020
New Revision: 361886
URL: https://svnweb.freebsd.org/changeset/base/361886
Log:
[if_ath] Don't update the beacon bits from beacon frames in hostapd mode.
This logic is running the beacon receive bits in STA+AP mode on both the
STA and AP side. The STA side sees its beacons from the BSS fine; the
AP side is seeing other beacons on the same channel but with the BSS
node for some odd reason. (I think it's a valid reason, but I currently
forget what that valid reason is.)
So, just to be cleaner about things, don't run the nexttbtt/etc bits
at all if we're in hostap mode. If I ever get mesh working then maybe
I'll make sure it works right on mesh+ap and mesh+sta modes.
Whilst here, log the VAP i'm being called on to make it clearer what
is going on. I may end up adding a VAP dprintf version of this at
some point.
Tested:
* AR9380, STA (DWDS client) + hostap on the same NIC
Modified:
head/sys/dev/ath/if_ath_rx.c
Modified: head/sys/dev/ath/if_ath_rx.c
==============================================================================
--- head/sys/dev/ath/if_ath_rx.c Sun Jun 7 04:57:48 2020
(r361885)
+++ head/sys/dev/ath/if_ath_rx.c Sun Jun 7 05:08:44 2020
(r361886)
@@ -379,12 +379,12 @@ ath_recv_mgmt(struct ieee80211_node *ni, struct mbuf *
* trying to sync / merge to BSSes that aren't
* actually us.
*/
- if (IEEE80211_ADDR_EQ(ni->ni_bssid, vap->iv_bss->ni_bssid)) {
+ if ((vap->iv_opmode != IEEE80211_M_HOSTAP) &&
+ IEEE80211_ADDR_EQ(ni->ni_bssid, vap->iv_bss->ni_bssid)) {
/* update rssi statistics for use by the hal */
/* XXX unlocked check against vap->iv_bss? */
ATH_RSSI_LPF(sc->sc_halstats.ns_avgbrssi, rssi);
-
tsf_beacon = ((uint64_t) le32dec(ni->ni_tstamp.data +
4)) << 32;
tsf_beacon |= le32dec(ni->ni_tstamp.data);
@@ -427,8 +427,9 @@ ath_recv_mgmt(struct ieee80211_node *ni, struct mbuf *
tsf_remainder = (tsf_beacon - tsf_beacon_old) %
tsf_intval;
}
- DPRINTF(sc, ATH_DEBUG_BEACON, "%s: old_tsf=%llu (%u),
new_tsf=%llu (%u), target_tsf=%llu (%u), delta=%lld, bmiss=%d, remainder=%d\n",
+ DPRINTF(sc, ATH_DEBUG_BEACON, "%s: %s: old_tsf=%llu
(%u), new_tsf=%llu (%u), target_tsf=%llu (%u), delta=%lld, bmiss=%d,
remainder=%d\n",
__func__,
+ ieee80211_get_vap_ifname(vap),
(unsigned long long) tsf_beacon_old,
(unsigned int) (tsf_beacon_old >> 10),
(unsigned long long) tsf_beacon,
@@ -439,8 +440,11 @@ ath_recv_mgmt(struct ieee80211_node *ni, struct mbuf *
tsf_delta_bmiss,
tsf_remainder);
- DPRINTF(sc, ATH_DEBUG_BEACON, "%s: tsf=%llu (%u),
nexttbtt=%llu (%u), delta=%d\n",
+ DPRINTF(sc, ATH_DEBUG_BEACON, "%s: %s: ni=%6D bssid=%6D
tsf=%llu (%u), nexttbtt=%llu (%u), delta=%d\n",
__func__,
+ ieee80211_get_vap_ifname(vap),
+ ni->ni_bssid, ":",
+ vap->iv_bss->ni_bssid, ":",
(unsigned long long) tsf_beacon,
(unsigned int) (tsf_beacon >> 10),
(unsigned long long) nexttbtt,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
