diff options
author | sam <sam@FreeBSD.org> | 2008-10-30 16:22:04 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-10-30 16:22:04 +0000 |
commit | 6094a6154c8f505530a7a0d0d49990faecc969b7 (patch) | |
tree | f9342e8ef90b370dd90a7749a0dca79b9ef07f92 /sys | |
parent | 11fd66de64959e9900dfb765d8f6987bcf8c6a8f (diff) | |
download | FreeBSD-src-6094a6154c8f505530a7a0d0d49990faecc969b7.zip FreeBSD-src-6094a6154c8f505530a7a0d0d49990faecc969b7.tar.gz |
Fix checks for fast frames negotiation. ni_ath_flags holds the
capabilities reported by the ap. These need to be cross-checked
against the local configuration in the vap. Previously we were
only checking the ap capabilities which meant that if an ap reported
it was ff-capable but we were not setup to use them we'd try to do
ff aggregation and drop the frame.
There are a number of problems to be fixed here but applying this
fix immediately as the problem causes all traffic to stop (and has
not workaround).
Reported by: Ashish Shukla
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ath/if_ath.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_adhoc.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_hostap.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_sta.c | 2 | ||||
-rw-r--r-- | sys/net80211/ieee80211_wds.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 712b0cc..f445811 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -1999,7 +1999,7 @@ ath_start(struct ifnet *ifp) ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; pri = M_WME_GETAC(m); txq = sc->sc_ac2q[pri]; - if (ni->ni_ath_flags & IEEE80211_NODE_FF) { + if (IEEE80211_ATH_CAP(ni->ni_vap, ni, IEEE80211_NODE_FF)) { /* * Check queue length; if too deep drop this * frame (tail drop considered good). diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index e9b8128..b8a5f7f 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -553,7 +553,7 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, m = ieee80211_decap_amsdu(ni, m); if (m == NULL) return IEEE80211_FC0_TYPE_DATA; - } else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) && + } else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) && #define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) m->m_pkthdr.len >= 3*FF_LLC_SIZE) { struct llc *llc; diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 1c837f4..fbc0305 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -752,7 +752,7 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m, m = ieee80211_decap_amsdu(ni, m); if (m == NULL) return IEEE80211_FC0_TYPE_DATA; - } else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) && + } else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) && #define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) m->m_pkthdr.len >= 3*FF_LLC_SIZE) { struct llc *llc; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index ebb28aa..35fcead 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -795,7 +795,7 @@ sta_input(struct ieee80211_node *ni, struct mbuf *m, m = ieee80211_decap_amsdu(ni, m); if (m == NULL) return IEEE80211_FC0_TYPE_DATA; - } else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) && + } else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) && #define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) m->m_pkthdr.len >= 3*FF_LLC_SIZE) { struct llc *llc; diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index ff55ed7..b003481 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -728,7 +728,7 @@ wds_input(struct ieee80211_node *ni, struct mbuf *m, m = ieee80211_decap_amsdu(ni, m); if (m == NULL) return IEEE80211_FC0_TYPE_DATA; - } else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) && + } else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) && #define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) m->m_pkthdr.len >= 3*FF_LLC_SIZE) { struct llc *llc; |