diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-01-26 21:28:56 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-01-26 21:28:56 +0000 |
| commit | 82d2bee5d0b8387a5ee5c90e4d5791286435c446 (patch) | |
| tree | 1d08daf4908560b4b98a867f6cb5c7a365cb3a82 /sys/net80211 | |
| parent | 2219875bf4225a098d693ebd159fdf2924cfd8c7 (diff) | |
remove ni_ba field from ieee80211_node structure as it is not used yet.
this reduces memory footprint and avoids a stack usage warning in
ieee80211_find_node() that breaks amd64 build.
pointed out by landry@
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_node.h | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index cfd101fc248..e06de3c0b3a 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.h,v 1.35 2009/01/26 19:09:41 damien Exp $ */ +/* $OpenBSD: ieee80211_node.h,v 1.36 2009/01/26 21:28:55 damien Exp $ */ /* $NetBSD: ieee80211_node.h,v 1.9 2004/04/30 22:57:32 dyoung Exp $ */ /*- @@ -207,8 +207,10 @@ struct ieee80211_node { struct timeout ni_sa_query_to; int ni_sa_query_count; +#ifdef notyet /* HT-immediate Block Ack */ struct ieee80211_ba ni_ba[IEEE80211_NUM_TID]; +#endif /* others */ u_int16_t ni_associd; /* assoc response */ diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 74642f11169..3186d6e1b97 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.81 2009/01/26 19:09:41 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.82 2009/01/26 21:28:55 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -599,9 +599,10 @@ ieee80211_encap(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node **pni) if (ic->ic_tid_noack & (1 << tid)) qos |= IEEE80211_QOS_ACK_POLICY_NOACK; +#ifndef IEEE80211_NO_HT else if (ni->ni_ba[tid].ba_state == IEEE80211_BA_AGREED) qos |= IEEE80211_QOS_ACK_POLICY_BA; - +#endif qwh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS; *(u_int16_t *)qwh->i_qos = htole16(qos); *(u_int16_t *)qwh->i_seq = |