diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-08-02 08:35:49 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-08-02 08:35:49 +0000 |
| commit | b3a4b02f94d605b9058554aacb872f061420e9b4 (patch) | |
| tree | 1e39c4587f4d2e0451a27701fbf34baebb17fde6 /sys/net80211 | |
| parent | efa7290d4c00698fd74854f1564f365582259100 (diff) | |
do not use IEEE80211_QOS_TID. its definition in ieee80211.h is
wrong. hard-code 0xf for now. will be fixed post-release.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 6 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 9e69f369c06..255f7b2352d 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.88 2008/08/02 08:20:16 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.89 2008/08/02 08:35:48 damien Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -186,11 +186,11 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, if (dir == IEEE80211_FC1_DIR_DSTODS) { struct ieee80211_qosframe_addr4 *qwh4 = (struct ieee80211_qosframe_addr4 *)wh; - tid = qwh4->i_qos[0] & IEEE80211_QOS_TID; + tid = qwh4->i_qos[0] & 0x0f; } else { struct ieee80211_qosframe *qwh = (struct ieee80211_qosframe *)wh; - tid = qwh->i_qos[0] & IEEE80211_QOS_TID; + tid = qwh->i_qos[0] & 0x0f; } orxseq = &ni->ni_qos_rxseqs[tid]; } else diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 20f0d324714..f6333c44194 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.65 2008/08/02 08:33:21 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.66 2008/08/02 08:35:48 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -549,7 +549,7 @@ ieee80211_encap(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node **pni) struct ieee80211_qosframe *qwh = (struct ieee80211_qosframe *)wh; qwh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS; - qwh->i_qos[0] = tid & IEEE80211_QOS_TID; + qwh->i_qos[0] = tid & 0xf; qwh->i_qos[1] = 0; /* no TXOP requested */ *(u_int16_t *)&qwh->i_seq[0] = htole16(ni->ni_qos_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT); |