diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-22 14:40:56 -0300 |
| commit | 0a3437aa52c010dc2ab10b9778a383fef436382c (patch) | |
| tree | b2f879569f9d9deb23e4d7accb103d30a64e1527 /sys/net80211/ieee80211_input.h | |
| parent | 6a0f7868a911546f7be04cc546e99cc803686af3 (diff) | |
| download | FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.zip FreeBSD-src-0a3437aa52c010dc2ab10b9778a383fef436382c.tar.gz | |
Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"
This reverts commit 6ee75bdd7bf7c20359dd6e38c243586cb062edea.
Diffstat (limited to 'sys/net80211/ieee80211_input.h')
| -rw-r--r-- | sys/net80211/ieee80211_input.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211_input.h b/sys/net80211/ieee80211_input.h index f3d569e..b90f46a 100644 --- a/sys/net80211/ieee80211_input.h +++ b/sys/net80211/ieee80211_input.h @@ -168,22 +168,19 @@ ieee80211_check_rxseq(struct ieee80211_node *ni, struct ieee80211_frame *wh) { #define SEQ_LEQ(a,b) ((int)((a)-(b)) <= 0) #define SEQ_EQ(a,b) ((int)((a)-(b)) == 0) +#define HAS_SEQ(type) ((type & 0x4) == 0) #define SEQNO(a) ((a) >> IEEE80211_SEQ_SEQ_SHIFT) #define FRAGNO(a) ((a) & IEEE80211_SEQ_FRAG_MASK) uint16_t rxseq; - uint8_t type, subtype; + uint8_t type; uint8_t tid; struct ieee80211_rx_ampdu *rap; rxseq = le16toh(*(uint16_t *)wh->i_seq); type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; - subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; - /* - * Types with no sequence number (or QoS (+)Null frames) - * are always treated valid. - */ - if (! IEEE80211_HAS_SEQ(type, subtype)) + /* Types with no sequence number are always treated valid */ + if (! HAS_SEQ(type)) return 1; tid = ieee80211_gettid(wh); @@ -238,6 +235,7 @@ ieee80211_check_rxseq(struct ieee80211_node *ni, struct ieee80211_frame *wh) return 1; #undef SEQ_LEQ #undef SEQ_EQ +#undef HAS_SEQ #undef SEQNO #undef FRAGNO } |
