diff options
| author | sam <sam@FreeBSD.org> | 2008-09-21 23:00:19 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-09-21 23:00:19 +0000 |
| commit | 7a8139bec34979455320162a624d9f5762a864d0 (patch) | |
| tree | 24722386b7e72f294b811c4f1cbee461b32b26ae /sys/net80211/ieee80211_freebsd.h | |
| parent | 50dd888a5f6605eebf5956acf6ab3c87e4e8a81e (diff) | |
| download | FreeBSD-src-7a8139bec34979455320162a624d9f5762a864d0.zip FreeBSD-src-7a8139bec34979455320162a624d9f5762a864d0.tar.gz | |
Cleanup AMPDU handling:
For receive:
o explicitly tag rx frames w/ M_AMPDU instead of passing frames through
the reorder processing according to the node having HT and the frame
being QoS data
o relax ieee80211_ampdu_reorder asserts to allow any frame to be passed
in, unsuitable frames are returned to the caller for normal processing;
this permits drivers that cannot inspect the PLCP to mark all data
frames as potential ampdu candidates with only a small penalty
o add M_AMPDU_MPDU to identify frames resubmitted from the reorder q
For transmit:
o tag aggregation candidates with M_AMPDU_MPDU
o fix the QoS ack policy set in ampdu subframes; we only support immediate
BA streams which should be marked for "normal ack" to get implicit block
ack behaviour; interestingly certain vendor parts BA'd frames with the
11e BA ack policy set
o do not assign a sequence # to aggregation candidates; this must be done
when frames are submitted for transmit (NB: this can/will be handled
better when aggregation is pulled up to net80211)
Diffstat (limited to 'sys/net80211/ieee80211_freebsd.h')
| -rw-r--r-- | sys/net80211/ieee80211_freebsd.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_freebsd.h b/sys/net80211/ieee80211_freebsd.h index fcd1b3f..448bd78 100644 --- a/sys/net80211/ieee80211_freebsd.h +++ b/sys/net80211/ieee80211_freebsd.h @@ -246,13 +246,17 @@ struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen); #define M_MORE_DATA M_PROTO5 /* more data frames to follow */ #define M_FF M_PROTO6 /* fast frame */ #define M_TXCB M_PROTO7 /* do tx complete callback */ +#define M_AMPDU_MPDU M_PROTO8 /* ok for A-MPDU aggregation */ #define M_80211_TX \ - (M_LINK0|M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB) + (M_LINK0|M_WDS|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB|M_AMPDU_MPDU) /* rx path usage */ -#define M_AMPDU M_PROTO1 /* A-MPDU processing done */ +#define M_AMPDU M_PROTO1 /* A-MPDU subframe */ #define M_WEP M_PROTO2 /* WEP done by hardware */ -#define M_80211_RX (M_AMPDU|M_WEP) +#if 0 +#define M_AMPDU_MPDU M_PROTO8 /* A-MPDU re-order done */ +#endif +#define M_80211_RX (M_AMPDU|M_WEP|M_AMPDU_MPDU) /* * Store WME access control bits in the vlan tag. * This is safe since it's done after the packet is classified |
